diff --git a/ckanext/harvest/controllers/organization.py b/ckanext/harvest/controllers/organization.py index ab70b89..73a7a67 100644 --- a/ckanext/harvest/controllers/organization.py +++ b/ckanext/harvest/controllers/organization.py @@ -1,5 +1,4 @@ import logging -import genshi from urllib import urlencode from ckan import plugins as p @@ -59,16 +58,7 @@ class OrganizationController(GroupController): q += ' owner_org: "%s"' % c.group_dict.get('id') else: q += ' groups: "%s"' % c.group_dict.get('name') - - try: - description_formatted = ckan.misc.MarkdownFormat().to_html( - c.group_dict.get('description', '')) - c.description_formatted = genshi.HTML(description_formatted) - except Exception, e: - error_msg = "%s" %\ - p.toolkit._("Cannot render description") - c.description_formatted = genshi.HTML(error_msg) - + context['return_query'] = True # c.group_admins is used by CKAN's legacy (Genshi) templates only, diff --git a/ckanext/harvest/templates/index.html b/ckanext/harvest/templates/index.html deleted file mode 100644 index 21351de..0000000 --- a/ckanext/harvest/templates/index.html +++ /dev/null @@ -1,95 +0,0 @@ - - - Harvesting Sources - - harvest no-sidebar - Harvesting Sources - - - - - - - - -
-
- -
-

Status:

- ${h.literal(c.status)} -
- - - - -
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ViewEditRefreshURLTypeActiveStatisticsNext HarvestCreated
${source['publisher_title']}${source['publisher_id']}
ViewEditRefresh${truncate(source.url, 50)}${source.type}${source.active}${source.status.msg}${source.status.msg}Datasets: ${source.status.overall_statistics.added}
- Last errors: ${source.status.last_harvest_statistics.errors}		${source.status.next_harvest}${h.render_datetime(source.created)}
- - -
No harvest sources defined yet.
- - - -
-
- - diff --git a/ckanext/harvest/templates/source/edit.html b/ckanext/harvest/templates/source/edit.html deleted file mode 100644 index bad3465..0000000 --- a/ckanext/harvest/templates/source/edit.html +++ /dev/null @@ -1,24 +0,0 @@ - - - Edit - Harvest Source - Edit harvest source - - hide-sidebar - - - - - -
-
- - - ${h.literal(c.form)} - -
-
- - diff --git a/ckanext/harvest/templates/source/new.html b/ckanext/harvest/templates/source/new.html deleted file mode 100644 index 2321e6d..0000000 --- a/ckanext/harvest/templates/source/new.html +++ /dev/null @@ -1,23 +0,0 @@ - - - New - Harvest Source - New harvest source - - hide-sidebar - - - - - -
-
- - ${h.literal(c.form)} - -
-
- - diff --git a/ckanext/harvest/templates/source/new_source_form.html b/ckanext/harvest/templates/source/new_source_form.html deleted file mode 100644 index 2fdabf1..0000000 --- a/ckanext/harvest/templates/source/new_source_form.html +++ /dev/null @@ -1,89 +0,0 @@ -
- -
-

Errors in form

-

The form contains invalid entries:

-
    -
  • ${"%s: %s" % (key, error)}
    • -
-
- -
- Details -
-
-
-
${errors.get('url', '')}
-
This should include the http:// part of the URL
-
-
- -
-
${errors.get('type', '')}
-
Which type of source does the URL above represent? -
    - -
  • ${harvester.title}: ${harvester.description}
    • -     -
-
- -
-
-
${errors.get('title', '')}
-
This will be shown as the datasets source.
- -
-
-
You can add your own notes here about what the URL above represents to remind you later.
- -
-
- -
-
Cannot add any publishers.
- - -
-
- -
-
- - -
This harvest source is Active
- - -
This harvest source is Withdrawn
- - -
-
-
- or Return to the harvest sources list - -
diff --git a/ckanext/harvest/templates/source/read.html b/ckanext/harvest/templates/source/read.html deleted file mode 100644 index 04cbc39..0000000 --- a/ckanext/harvest/templates/source/read.html +++ /dev/null @@ -1,149 +0,0 @@ - - - Harvest Source Details - Harvest Source Details - - - - - -
-
- - -
NB: This Harvest Source is Withdrawn. Therefore the Gemini XML will not be harvested again. However, any metadata that was previously harvested, remains in the catalogue.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID${c.source.id}
URL${c.source.url}
Type${c.source.type}
Withdrawn${not c.source.active}
Title${c.source.title}
Description${c.source.description}
Configuration${c.source.config}-
User${c.source.user_id}
Publisher${c.source.publisher_title}${c.source.publisher_id}
Created${c.source.created}
Total jobs${c.source.status.job_count}
Status - Last Harvest Errors: ${c.source.status.last_harvest_statistics.errors}
- - - Gathering errors -
    -
  • - -
    ${line}
    -
    • -
- - - - - Object errors - - - - - Last Harvest Added: ${c.source.status.last_harvest_statistics.added}
- Last Harvest Updated: ${c.source.status.last_harvest_statistics.updated}
- Last Harvest: ${c.source.status.last_harvest_request}
- Next Harvest: ${c.source.status.next_harvest} -
Total Errors${c.source.status.overall_statistics.errors}
Total Datasets${c.source.status.overall_statistics.added}
Datasets - -
There could be a 10 minutes delay before these datasets (or changes to them) appear on - the site or on search results.
- -

There are ${c.page.item_count} datasets.

- - ${c.page.pager()} - - - - ${c.page.pager()} - -
- -
-
- -