CatalogueRevamping
/
harvester-d4science
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'logilab-deprecation/nav_named_link'

This commit is contained in:
amercader 2016-03-21 13:18:50 +00:00
parent 7f506913f8 a8732553c9
commit 8a3db211a0
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ckanext/harvest/templates/source/admin_base.html
View File

@ -29,7 +29,7 @@
</a> </a>
{{ '</li>' if show_li }} {{ '</li>' if show_li }}
{{ '<li>' if show_li }}{{ h.nav_named_link(_('View harvest source'), '{0}_read'.format(c.dataset_type), id=source.name, class_='btn', icon='eye-open')}}{{ '</li>' if show_li }} {{ '<li>' if show_li }}{{ h.nav_link(_('View harvest source'), named_route='{0}_read'.format(c.dataset_type), id=source.name, class_='btn', icon='eye-open')}}{{ '</li>' if show_li }}
{% endblock %} {% endblock %}
{# CKAN 2.0 #} {# CKAN 2.0 #}

12
ckanext/harvest/templates/source/base.html
View File

@ -14,12 +14,12 @@
{% block breadcrumb_content %} {% block breadcrumb_content %}
{% if source.organization %} {% if source.organization %}
{% set org = source.organization %} {% set org = source.organization %}
<li>{{ h.nav_named_link(_('Organizations'), 'organizations_index') }}</li> <li>{{ h.nav_link(_('Organizations'), named_route='organizations_index') }}</li>
<li>{{ h.nav_named_link(org.title or org.name|truncate(10), 'organization_read', id=org.name) }}</li> <li>{{ h.nav_link(org.title or org.name|truncate(10), named_route='organization_read', id=org.name) }}</li>
<li>{{ h.nav_named_link(_('Harvest Sources'), '{0}_search'.format(c.dataset_type)) }}</li> <li>{{ h.nav_link(_('Harvest Sources'), named_route='{0}_search'.format(c.dataset_type)) }}</li>
<li{{ self.breadcrumb_content_root_selected() }}>{{ h.nav_named_link(c.harvest_source.title|truncate(10), '{0}_read'.format(c.dataset_type), id=c.harvest_source.name) }}</li> <li{{ self.breadcrumb_content_root_selected() }}>{{ h.nav_link(c.harvest_source.title|truncate(10), named_route='{0}_read'.format(c.dataset_type), id=c.harvest_source.name) }}</li>
{% else %} {% else %}
<li>{{ h.nav_named_link(_('Harvest Sources'), '{0}_search'.format(c.dataset_type)) }}</li> <li>{{ h.nav_link(_('Harvest Sources'), named_route='{0}_search'.format(c.dataset_type)) }}</li>
<li{{ self.breadcrumb_content_root_selected() }}>{{ h.nav_named_link(c.harvest_source.title|truncate(30), '{0}_read'.format(c.dataset_type), id=c.harvest_source.name) }}</li> <li{{ self.breadcrumb_content_root_selected() }}>{{ h.nav_link(c.harvest_source.title|truncate(30), named_route='{0}_read'.format(c.dataset_type), id=c.harvest_source.name) }}</li>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

2
ckanext/harvest/templates/source/job/read.html
View File

@ -6,7 +6,7 @@
<div class="module-content"> <div class="module-content">
<p class="pull-right"> <p class="pull-right">
{{ h.nav_named_link(_('Back to job list'), 'harvest_job_list', source=source.name, class_='btn', icon='arrow-left')}} {{ h.nav_link(_('Back to job list'), named_route='harvest_job_list', source=source.name, class_='btn', icon='arrow-left')}}
</p> </p>
<h1>{{ _('Job Report') }}</h1> <h1>{{ _('Job Report') }}</h1>

4
ckanext/harvest/templates/source/read_base.html
View File

@ -1,7 +1,7 @@
{% extends "source/base.html" %} {% extends "source/base.html" %}
{% block admin_link %} {% block admin_link %}
{{ h.nav_named_link(_('Admin'), '{0}_admin'.format(c.dataset_type), id=c.harvest_source.name, class_='btn btn-primary', icon='wrench')}} {{ h.nav_link(_('Admin'), named_route='{0}_admin'.format(c.dataset_type), id=c.harvest_source.name, class_='btn btn-primary', icon='wrench')}}
{% endblock %} {% endblock %}
{# CKAN 2.0 #} {# CKAN 2.0 #}
@ -19,7 +19,7 @@
{% if c.harvest_source.notes %} {% if c.harvest_source.notes %}
<p> <p>
{{ h.markdown_extract(c.harvest_source.notes, 180) }} {{ h.markdown_extract(c.harvest_source.notes, 180) }}
{{ h.nav_named_link(_('read more'), '{0}_about'.format(c.dataset_type), id=c.harvest_source.name) }} {{ h.nav_link(_('read more'), named_route='{0}_about'.format(c.dataset_type), id=c.harvest_source.name) }}
</p> </p>
{% else %} {% else %}
<p class="empty">{{ _('There is no description for this harvest source') }}</p> <p class="empty">{{ _('There is no description for this harvest source') }}</p>

2
ckanext/harvest/templates/source/search.html
View File

@ -4,7 +4,7 @@
{% block breadcrumb_content %} {% block breadcrumb_content %}
<li class="active">{{ h.nav_named_link(_('Harvest Sources'), '{0}_search'.format(c.dataset_type)) }}</li> <li class="active">{{ h.nav_link(_('Harvest Sources'), named_route='{0}_search'.format(c.dataset_type)) }}</li>
{% endblock %} {% endblock %}