diff --git a/ckanext/odsh/templates/footer.html b/ckanext/odsh/templates/footer.html
index 8c91856decdc05bf7417a3c3c954182bf43aca5e..4003668fa817534b06a555421516c211ef78a171 100644
--- a/ckanext/odsh/templates/footer.html
+++ b/ckanext/odsh/templates/footer.html
@@ -1,20 +1,20 @@
<footer class="footer">
- <div class="container">
- <div class="footer-content">
- <div class='footer-first-row'>
- <div class="footer-left">
- </div>
- </div>
- <div class='footer-line'></div>
- <div class="footer-left">
- <div class="footer-icon">© {{g.site_title}}</div>
- </div>
- <div class="footer-right">
- <div class='footer-icon'><a href='http://www.schleswig-holstein.de/odpkontakt'>Kontakt</a></div>
- <div class='footer-icon'><a href='http://www.schleswig-holstein.de/odpimpressum'>Impressum</a></div>
- <div class='footer-icon'><a href='https://www.schleswig-holstein.de/DE/Serviceseiten/Barrierefreiheitserklaerung/barrierefreiheit_node.html'>Barrierefreiheit</a></div>
- <div class='footer-icon last'><a href='http://www.schleswig-holstein.de/odpdatenschutz'>Datenschutz</a></div>
- </div>
- </div>
+ <div class="container">
+ <div class="footer-content">
+ <div class='footer-first-row'>
+ <div class="footer-left"></div>
+ </div>
+ <div class='footer-line'></div>
+ <div class="footer-left">
+ <div class="footer-icon">© {{g.site_title}}</div>
+ </div>
+ <div class="footer-right">
+ <div class='footer-icon'><a href='http://www.schleswig-holstein.de/odpkontakt'>{{ _("Contact") }}</a></div>
+ <div class='footer-icon'><a href='http://www.schleswig-holstein.de/odpimpressum'>{{ _("Imprint") }}</a></div>
+ <div class='footer-icon'><a href='https://www.schleswig-holstein.de/DE/Serviceseiten/Barrierefreiheitserklaerung/barrierefreiheit_node.html'>{{ _("
+ Accessibility") }}</a></div>
+ <div class='footer-icon last'><a href='http://www.schleswig-holstein.de/odpdatenschutz'>{{ _("Data protection") }}</a></div>
+ </div>
</div>
+ </div>
</footer>
diff --git a/ckanext/odsh/templates/header.html b/ckanext/odsh/templates/header.html
index 32e58bfe9ce5c8142684e6c66143f84998cee5b7..3ea25dcab4e87138613d9abd506ca7f8493b4077 100644
--- a/ckanext/odsh/templates/header.html
+++ b/ckanext/odsh/templates/header.html
@@ -5,8 +5,7 @@
{% set dataset_type = h.default_package_type() %}
{% set org_type = h.default_group_type('organization') %}
-{% block header_wrapper %}
-{% block header_account %}
+{% block header_wrapper %} {% block header_account %}
<header class="navbar navbar-static-top masthead">
<div class="container topline">
<hgroup class="{{ g.header_class }}">
diff --git a/ckanext/odsh/templates/snippets/organization.html b/ckanext/odsh/templates/snippets/organization.html
index 86e9203407ce2d9c79d58d40c9040059232172ce..94fa411469b58aea0e887416422feb29a46bc420 100644
--- a/ckanext/odsh/templates/snippets/organization.html
+++ b/ckanext/odsh/templates/snippets/organization.html
@@ -18,99 +18,99 @@ Example:
{% block info %}
<div class="module module-narrow module-shallow context-info">
- {% block heading %}
+ {% block heading %}
<h1 class="heading">{{ organization.title or organization.name }}
- {% if organization.state == 'deleted' %}
+ {% if organization.state == 'deleted' %}
[{{ _('Deleted') }}]
- {% endif %}
+ {% endif %}
</h1>
- {% endblock heading%}
- <section id="section-org" class="module-content">
- {% block inner %}
- {% block image %}
+ {% endblock heading%}
+ <section id="section-org" class="module-content">
+ {% block inner %}
+ {% block image %}
<div class="image">
- <img src="{{ organization.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}"
- width="200" alt="{{ organization.name }}" />
+ <img src="{{ organization.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}"
+ width="200" alt="{{ organization.name }}" />
</div>
<div class="information-organisation">
- {% set address = h.get_address_org(organization) %}
- {% set street = address.get('street') %}
- {% set location = address.get('location') %}
- {% set mail = address.get('mail') %}
- {% set telephone = address.get('telephone') %}
- {% set web = address.get('web') %}
-
- {% if person %}
+ {% set address = h.get_address_org(organization) %}
+ {% set street = address.get('street') %}
+ {% set location = address.get('location') %}
+ {% set mail = address.get('mail') %}
+ {% set telephone = address.get('telephone') %}
+ {% set web = address.get('web') %}
+
+ {% if person %}
<p>
- {{ person }}
+ {{ person }}
</p>
- {% endif %} {# person #}
+ {% endif %} {# person #}
- {% if street and location %}
+ {% if street and location %}
<p>{{ street }}</p>
<p>{{ location }}</p>
- {% endif %} {# street and location #}
-
- {% if mail %}
+ {% endif %} {# street and location #}
+
+ {% if mail %}
{% if package %}
- {% set package_name = package.get('name') %}
- {% set betreff = "Open-Data-Portal Datensatz: "+ package_name%}
- {% set body_mail = h.get_body_mail(organization, package) %}
- {% else %}
- {% set betreff = "Transparenzportal" %}
+ {% set package_name = package.get('name') %}
+ {% set betreff = "Open-Data-Portal Datensatz: "+ package_name%}
+ {% set body_mail = h.get_body_mail(organization, package) %}
+ {% else %}
+ {% set betreff = "Transparenzportal" %}
{% endif %} {# package #}
<p>
- <a href="mailto:{{ mail }}?subject={{betreff}}&body={{body_mail}}Viele Grüße">{{ mail }}</a>
+ <a href="mailto:{{ mail }}?subject={{betreff}}&body={{body_mail}}Viele Grüße">{{ mail }}</a>
</p>
- {% endif %} {# mail #}
+ {% endif %} {# mail #}
- {% if telephone %}
+ {% if telephone %}
<p class="phone">
- {{ telephone }}
+ {{ telephone }}
</p>
- {% endif %} {# telephone #}
-
- {% if web %}
+ {% endif %} {# telephone #}
+
+ {% if web %}
<p>
- <a href="{{address.web}}">{{ address.web }}</a>
+ <a href="{{address.web}}">{{ address.web }}</a>
</p>
- {% endif %} {# web #}
+ {% endif %} {# web #}
</div>
- {% endblock image%}
+ {% endblock image%}
- {% if not hide_description %}
+ {% if not hide_description %}
{% block description %}
- {% if organization.description %}
- <p>
- {{ h.markdown_extract(organization.description, 180) }}
- {% link_for _('read more'), named_route='organization.about', id=organization.name %}
- </p>
- {% else %}
- <p class="empty">{{ _('There is no description for this organization') }}</p>
- {% endif %}
+ {% if organization.description %}
+ <p>
+ {{ h.markdown_extract(organization.description, 180) }}
+ {% link_for _('read more'), named_route='organization.about', id=organization.name %}
+ </p>
+ {% else %}
+ <p class="empty">{{ _('There is no description for this organization') }}</p>
+ {% endif %}
{% endblock description %}
- {% endif %}
- {% if show_nums %}
+ {% endif %}
+ {% if show_nums %}
{% block nums %}
- <div class="nums">
+ <div class="nums">
<dl>
- <dt>{{ _('Followers') }}</dt>
- <dd>{{ h.SI_number_span(organization.num_followers) }}</dd>
+ <dt>{{ _('Followers') }}</dt>
+ <dd>{{ h.SI_number_span(organization.num_followers) }}</dd>
</dl>
<dl>
- <dt>{{ _('Documents') }}</dt>
- <dd>{{ h.SI_number_span(organization.package_count) }}</dd>
+ <dt>{{ _('Documents') }}</dt>
+ <dd>{{ h.SI_number_span(organization.package_count) }}</dd>
</dl>
- </div>
+ </div>
{% endblock nums%}
{% block follow %}
- <div class="follow_button">
+ <div class="follow_button">
{{ h.follow_button('group', organization.id) }}
- </div>
+ </div>
{% endblock follow %}
- {% endif %}
- {% endblock inner %}
- </section>
+ {% endif %}
+ {% endblock inner %}
+ </section>
</div>
{% endblock %}
diff --git a/ckanext/odsh/templates/snippets/package_item.html b/ckanext/odsh/templates/snippets/package_item.html
index f38bbe026cf8ab289d93e0c3a5b915da5a6b1483..4cc93ad54d44d4f89687578aa10d797e7e35fe65 100644
--- a/ckanext/odsh/templates/snippets/package_item.html
+++ b/ckanext/odsh/templates/snippets/package_item.html
@@ -32,10 +32,10 @@ Example:
{% set thumbnail = package.get('thumbnail') %}
{% block package_item %}
-<div class="odsh-dataset-item">
+ <div class="odsh-dataset-item">
{% block content %}
<div class="dataset-content">
- {% block heading %}
+ {% block heading %}
{% if package.get('type') == 'collection' %}
<div class='package-info-pill purple'>
{{ _('Data series') }}
@@ -119,36 +119,35 @@ Example:
<div class='dataset-spacer'></div>
- <div class="dataset-meta">
- {% block resources %}
- {% block resources_outer %}
- {% if package.resources and not hide_resources %}
- <ul class="dataset-resources">
- {% block resources_inner %}
- {% for resource in h.dict_list_reduce(package.resources, 'format') %}
- <li>
- <a href="{{ h.url_for(package.type ~ '.read', id=package.name) }}" class="badge badge-default dataformat-label"
- data-format="{{ h.format_resource_format(resource).lower() }}">
- {{ h.format_resource_format(resource) }}
- </a>
- </li>
- {% endfor %}
- {% endblock %}
- </ul>
- {% endif %}
- <div class="dataset-stars">
- {% if stars>-1%}
- {% snippet "qa/stars.html", stars=stars %}
- {% endif %}
- </div>
+ <div class="dataset-meta">
+ {% block resources %}
+ {% block resources_outer %}
+ {% if package.resources and not hide_resources %}
+ <ul class="dataset-resources">
+ {% block resources_inner %}
+ {% for resource in h.dict_list_reduce(package.resources, 'format') %}
+ <li>
+ <a href="{{ h.url_for(package.type ~ '.read', id=package.name) }}" class="badge badge-default dataformat-label"
+ data-format="{{ h.format_resource_format(resource).lower() }}">
+ {{ h.format_resource_format(resource) }}
+ </a>
+ </li>
+ {% endfor %}
+ {% endblock %}
+ </ul>
+ {% endif %}
+ <div class="dataset-stars">
+ {% if stars>-1%}
+ {% snippet "qa/stars.html", stars=stars %}
+ {% endif %}
+ </div>
- <div class="dataset-info issued">
- <p>{{ _('Issued') }}: {{issued}} </p>
+ <div class="dataset-info issued">
+ <p>{{ _('Issued') }}: {{issued}} </p>
+ </div>
+ {% endblock %}
+ {% endblock %}
</div>
- {% endblock %}
- {% endblock %}
- </div>
-
{% endblock content %}
-</div>
+ </div>
{% endblock package_item %}
diff --git a/ckanext/odsh/templates/snippets/social.html b/ckanext/odsh/templates/snippets/social.html
index d2d37670a9f0d86b90b10cd03a871b2612b7b953..f0e922f55d8efa47b5793329cc07335db1fb7cc9 100644
--- a/ckanext/odsh/templates/snippets/social.html
+++ b/ckanext/odsh/templates/snippets/social.html
@@ -1,13 +1,13 @@
{% set current_url = h.full_current_url() %}
{% block social %}
-<section class="module module-narrow social">
+ <section class="module module-narrow social">
{% block social_title %}
{% endblock %}
{% block social_nav %}
<ul class="nav nav-simple">
- <li class="nav-item"><a href="https://www.facebook.com/sharer.php?u={{ current_url }}" target="_blank"><i class="fa fa-facebook-square"></i></a></li>
- <li class="nav-item"><a href="https://twitter.com/share?url={{ current_url }}" target="_blank"><i class="fa fa-twitter-square"></i></a></li>
+ <li class="nav-item"><a href="https://www.facebook.com/sharer.php?u={{ current_url }}" target="_blank"><i class="fa fa-facebook-square"></i></a></li>
+ <li class="nav-item"><a href="https://twitter.com/share?url={{ current_url }}" target="_blank"><i class="fa fa-twitter-square"></i></a></li>
</ul>
{% endblock %}
-</section>
+ </section>
{% endblock %}
\ No newline at end of file
diff --git a/ckanext/odsh/templates/user/edit_user_form.html b/ckanext/odsh/templates/user/edit_user_form.html
index e33ba52bb16cadf0249be2ea7658426bd4a307a4..ddfb63c79ad991b697bfd5dac49b8d15ca31986e 100644
--- a/ckanext/odsh/templates/user/edit_user_form.html
+++ b/ckanext/odsh/templates/user/edit_user_form.html
@@ -15,7 +15,6 @@
{{ form.input('email', label=_('Email'), id='field-email', type='email', value=data.email, error=errors.email, placeholder=_('eg. joe@example.com'), classes=['control-medium'], is_required=true) }}
{{ form.markdown('about', label=_('About'), id='field-about', value=data.about, error=errors.about, placeholder=_('A little information about yourself')) }}
-
</fieldset>
{% endblock %}
@@ -31,9 +30,9 @@
{% if is_sysadmin and current_user.name != data.name %}
{% block sysadmin_password %}
<fieldset>
- <legend>{{ _('Change ' + data.name|capitalize + "'s" + ' password') }}</legend>
- {{ form.input('password1', type='password', label=_('Password'), id='field-password', value=data.password1, error=errors.password1, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'} ) }}
- {{ form.input('password2', type='password', label=_('Confirm Password'), id='field-password-confirm', value=data.password2, error=errors.password2, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'}) }}
+ <legend>{{ _('Change ' + data.name|capitalize + "'s" + ' password') }}</legend>
+ {{ form.input('password1', type='password', label=_('Password'), id='field-password', value=data.password1, error=errors.password1, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'} ) }}
+ {{ form.input('password2', type='password', label=_('Confirm Password'), id='field-password-confirm', value=data.password2, error=errors.password2, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'}) }}
</fieldset>
{% endblock %}