From 2879b92be5c4392ea67ed0bb863cbf7e375ce414 Mon Sep 17 00:00:00 2001 From: John Martin Date: Tue, 24 Dec 2013 13:54:13 +0000 Subject: [PATCH] [#1302] Removes mentions of 'no description' from templates --- ckan/templates/group/about.html | 2 -- ckan/templates/group/snippets/group_item.html | 2 -- ckan/templates/group/snippets/info.html | 2 -- ckan/templates/organization/about.html | 2 -- ckan/templates/organization/bulk_process.html | 2 -- ckan/templates/organization/snippets/organization_item.html | 2 -- ckan/templates/package/resource_read.html | 2 -- ckan/templates/package/snippets/package_context.html | 2 -- ckan/templates/package/snippets/resource_item.html | 2 -- ckan/templates/related/snippets/related_item.html | 2 -- ckan/templates/snippets/group.html | 2 -- ckan/templates/snippets/group_item.html | 2 -- ckan/templates/snippets/organization_item.html | 2 -- ckan/templates/snippets/package_item.html | 2 -- 14 files changed, 28 deletions(-) diff --git a/ckan/templates/group/about.html b/ckan/templates/group/about.html index a7d3683700d..bec97ae26e6 100644 --- a/ckan/templates/group/about.html +++ b/ckan/templates/group/about.html @@ -7,8 +7,6 @@

{% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}

{% block group_description %} {% if c.group_dict.description %} {{ h.render_markdown(c.group_dict.description) }} - {% else %} -

{{ _('There is no description for this group') }}

{% endif %} {% endblock %} diff --git a/ckan/templates/group/snippets/group_item.html b/ckan/templates/group/snippets/group_item.html index 04351329f2b..ca90dedd647 100644 --- a/ckan/templates/group/snippets/group_item.html +++ b/ckan/templates/group/snippets/group_item.html @@ -23,8 +23,6 @@

{{ group.display_name }}

{% block description %} {% if group.description %}

{{ h.markdown_extract(group.description, extract_length=80) }}

- {% else %} -

{{ _('This group has no description') }}

{% endif %} {% endblock %} {% block datasets %} diff --git a/ckan/templates/group/snippets/info.html b/ckan/templates/group/snippets/info.html index dc86036bb4c..72db2cf8c5e 100644 --- a/ckan/templates/group/snippets/info.html +++ b/ckan/templates/group/snippets/info.html @@ -11,8 +11,6 @@

{{ group.display_name }}

{{ h.markdown_extract(group.description, 180) }} {% link_for _('read more'), controller='group', action='about', id=group.name %}

- {% else %} -

{{ _('There is no description for this group') }}

{% endif %} {% if show_nums %}
diff --git a/ckan/templates/organization/about.html b/ckan/templates/organization/about.html index 6d3fcfe1bfd..ed0e7b718ae 100644 --- a/ckan/templates/organization/about.html +++ b/ckan/templates/organization/about.html @@ -7,8 +7,6 @@

{% block page_heading %}{{ c.group_dict.display_name }}{% endblock %}

{% block organization_description %} {% if c.group_dict.description %} {{ h.render_markdown(c.group_dict.description) }} - {% else %} -

{{ _('There is no description for this organization') }}

{% endif %} {% endblock %} {% block organization_extras %} diff --git a/ckan/templates/organization/bulk_process.html b/ckan/templates/organization/bulk_process.html index 13c2001e45c..d4e4fa54bd1 100644 --- a/ckan/templates/organization/bulk_process.html +++ b/ckan/templates/organization/bulk_process.html @@ -77,8 +77,6 @@

{% if notes %}

{{ notes|urlize }}

- {% else %} -

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

{% endif %} diff --git a/ckan/templates/organization/snippets/organization_item.html b/ckan/templates/organization/snippets/organization_item.html index 5d774cb7f39..1d7ca32e308 100644 --- a/ckan/templates/organization/snippets/organization_item.html +++ b/ckan/templates/organization/snippets/organization_item.html @@ -22,8 +22,6 @@

{{ organization.display_name }}

{% block description %} {% if organization.description %}

{{ h.markdown_extract(organization.description, extract_length=80) }}

- {% else %} -

{{ _('This organization has no description') }}

{% endif %} {% endblock %} {% block datasets %} diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html index dee83c32e0d..2eca1e62fbc 100644 --- a/ckan/templates/package/resource_read.html +++ b/ckan/templates/package/resource_read.html @@ -61,8 +61,6 @@
{% if res.description %} {{ h.render_markdown(res.description) }} - {% else %} -

{{ _('There is no description for this resource') }}

{% endif %} {% if not res.description and c.package.notes %}

{{ _('From the dataset abstract') }}

diff --git a/ckan/templates/package/snippets/package_context.html b/ckan/templates/package/snippets/package_context.html index 3640468c51e..110bbd5201b 100644 --- a/ckan/templates/package/snippets/package_context.html +++ b/ckan/templates/package/snippets/package_context.html @@ -6,8 +6,6 @@

{{ pkg.title or pkg.name }}

{{ h.markdown_extract(pkg.notes, 180) }} {% link_for _('read more'), controller='package', action='about', id=pkg.name %}

- {% else %} -

{{ _('There is no description for this dataset') }}

{% endif %}
diff --git a/ckan/templates/package/snippets/resource_item.html b/ckan/templates/package/snippets/resource_item.html index da03ec496f9..1a7c43490a4 100644 --- a/ckan/templates/package/snippets/resource_item.html +++ b/ckan/templates/package/snippets/resource_item.html @@ -12,8 +12,6 @@

{% if res.description %} {{ h.markdown_extract(res.description, extract_length=80) }} - {% else %} - {{ _('No description for this resource') }} {% endif %}

{% block resource_item_explore %} diff --git a/ckan/templates/related/snippets/related_item.html b/ckan/templates/related/snippets/related_item.html index df1c1300025..2053f7c0406 100644 --- a/ckan/templates/related/snippets/related_item.html +++ b/ckan/templates/related/snippets/related_item.html @@ -19,8 +19,6 @@

{{ related.title }}

{% if related.description %}
{{ h.render_markdown(related.description) }}
- {% else %} -

{{ _('This item has no description') }}

{% endif %} {{ tooltip }} diff --git a/ckan/templates/snippets/group.html b/ckan/templates/snippets/group.html index db758d9bc96..df0d44ca031 100644 --- a/ckan/templates/snippets/group.html +++ b/ckan/templates/snippets/group.html @@ -20,8 +20,6 @@

{{ group.title or group.name }}

{% if group.description %}

{{ h.markdown_extract(group.description, truncate) }}

- {% else %} -

{{ _('There is no description for this group') }}

{% endif %}
diff --git a/ckan/templates/snippets/group_item.html b/ckan/templates/snippets/group_item.html index 60f43f63b79..032f05fad15 100644 --- a/ckan/templates/snippets/group_item.html +++ b/ckan/templates/snippets/group_item.html @@ -14,8 +14,6 @@

{{ group.title or group.name }}{{ h.markdown_extract(group.description, truncate)|urlize }}

{% endif %} - {% else %} -

{{ _('There is no description for this group') }}

{% endif %} {% set list_class = "unstyled dataset-list" %} diff --git a/ckan/templates/snippets/organization_item.html b/ckan/templates/snippets/organization_item.html index 06579756f32..2b066464b77 100644 --- a/ckan/templates/snippets/organization_item.html +++ b/ckan/templates/snippets/organization_item.html @@ -12,8 +12,6 @@

{{ organization.title or organizatio {% else %}

{{ h.markdown_extract(organization.description, truncate)|urlize }}

{% endif %} - {% else %} -

{{ _('There is no description for this organization') }}

{% endif %} {% set list_class = "unstyled dataset-list" %} diff --git a/ckan/templates/snippets/package_item.html b/ckan/templates/snippets/package_item.html index b6ae1b95168..42bb4fc0244 100644 --- a/ckan/templates/snippets/package_item.html +++ b/ckan/templates/snippets/package_item.html @@ -41,8 +41,6 @@

{% endif %} {% if notes %}
{{ notes|urlize }}
- {% else %} -

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

{% endif %}

{% if package.resources and not hide_resources %}