diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py index 54d58193405..f72d5c4efde 100644 --- a/ckan/lib/helpers.py +++ b/ckan/lib/helpers.py @@ -20,7 +20,7 @@ from routes import url_for, redirect_to from alphabet_paginate import AlphaPage from lxml.html import fromstring -from i18n import get_available_locales, _ +from i18n import get_available_locales @@ -338,30 +338,6 @@ def resource_display_name(resource_dict): else: return '[no name] %s ' % resource_dict['id'] -def resource_star_rating(resource_dict): - stars = 0 if ('index' in resource_dict.get('url')) else 3 - - if stars==0: - message = _('When we last checked, this resource was not available.'), - return literal('%s404?' % message) - - captions = [ - _('Available under an open license.'), - _('Available as structured data (eg. Excel instead of a scanned table).'), - _('Uses non-proprietary formats (e.g., CSV instead of Excel).'), - _('Uses URIs to identify things, so that people can link to it.'), - _('Linked to other data to provide context.') - ] - - caption = "" - for i in range(5,0,-1): - fail = 'fail' if (i > stars) else '' - text_stars = i * '★' - caption += literal('%s  "%s"' % (fail, text_stars, captions[i-1])) - - star_icons = stars * icon('star') - return literal('%s%s' % (caption, star_icons)) - def resource_link(resource_dict, package_id): text = resource_display_name(resource_dict) url = url_for(controller='package', diff --git a/ckan/public/css/style.css b/ckan/public/css/style.css index 28efc18ac9a..4520beb9469 100644 --- a/ckan/public/css/style.css +++ b/ckan/public/css/style.css @@ -212,7 +212,7 @@ tbody tr.table-empty td { } .hover-for-help > .help-text { position: absolute; - top: 18px; + top: 24px; left: -90px; display: none; padding: 2px 8px; @@ -237,6 +237,7 @@ tbody tr.table-empty td { border-bottom: 1px dashed #000; } + /* =============== */ /* MinorNavigation */ /* =============== */ @@ -1170,14 +1171,6 @@ body.package.read h3 { opacity:0.4; filter:alpha(opacity=40); /* For IE8 and earlier */ } -.search-result .star-rating { - display: block; - padding-top: 5px; - text-align: right; -} -.search-result .hover-for-help { - font-size: 11px; -} .search-result .view-more-link:hover { opacity:1.0; filter:alpha(opacity=100); /* For IE8 and earlier */ diff --git a/ckan/public/scripts/application.js b/ckan/public/scripts/application.js index 24f98964e7a..48dc00e1acd 100644 --- a/ckan/public/scripts/application.js +++ b/ckan/public/scripts/application.js @@ -8,7 +8,6 @@ CKAN.Utils.setupFormatAutocomplete($(this)); }); CKAN.Utils.setupMarkdownEditor($('.markdown-editor')); - // set up ckan js var config = { endpoint: CKAN.SITE_URL + '/' diff --git a/ckan/templates/package/read_core.html b/ckan/templates/package/read_core.html index 2c15825d3e3..fcadb6298e7 100644 --- a/ckan/templates/package/read_core.html +++ b/ckan/templates/package/read_core.html @@ -18,12 +18,9 @@

Resources

-
+
${h.resource_display_name(res)}    diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html index 724e6e367fe..14e2910cc1f 100644 --- a/ckan/templates/package/resource_read.html +++ b/ckan/templates/package/resource_read.html @@ -45,7 +45,7 @@
-
+
Part of dataset
@@ -77,8 +77,6 @@
-
Quality
-
${h.resource_star_rating(c.resource)}