[#715] Checks if resource can be previewed and that changes the UX

Adds new helper function to check if a resource can be previewed and adds it to the templates.
ckan · Jun 11, 2013 · 1c7b086 · 1c7b086
1 parent a865639
commit 1c7b086
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -1466,6 +1466,11 @@ def format_resource_items(items):
     return sorted(output, key=lambda x: x[0])
 
 
+def can_be_previewed(resource, package):
+    data_dict = {'resource': resource, 'package': package}
+    return datapreview.can_be_previewed(data_dict)
+
+
 def resource_preview(resource, pkg_id):
     '''
     Returns a rendered snippet for a embedded resource preview.
@@ -1633,6 +1638,7 @@ def SI_number_span(number):
     'render_markdown',
     'format_resource_items',
     'resource_preview',
+    'can_be_previewed',
     'SI_number_span',
     'localised_number',
     'localised_SI_number',

diff --git a/ckan/templates/package/resource_read.html b/ckan/templates/package/resource_read.html
@@ -29,6 +29,8 @@
                     <i class="icon-eye-open"></i> {{ _('View') }}
                   {% elif  res.resource_type == 'api' %}
                     <i class="icon-key"></i> {{ _('API Endpoint') }}
+                  {% elif not h.can_be_previewed(res, pkg) %}
+                    <i class="icon-external-link"></i> {{ _('Go to resource') }}
                   {% else %}
                     <i class="icon-download"></i> {{ _('Download') }}
                   {% endif %}

diff --git a/ckan/templates/package/snippets/resource_item.html b/ckan/templates/package/snippets/resource_item.html
@@ -1,4 +1,5 @@
 {% set url = h.url_for(controller='package', action='resource_read', id=pkg.name, resource_id=res.id) %}
+{% set can_be_previewed = h.can_be_previewed(resource=res, package=pkg) %}
 <li class="resource-item">
   {% block resource_item_title %}
   <a class="heading" href="{{ url }}" title="{{ res.name or res.description }}">
@@ -24,14 +25,24 @@
       {% block resource_item_explore_links %}
       <li>
         <a href="{{ url }}">
-          <i class="icon-bar-chart"></i>
-          {{ _('Preview') }}
+          {% if can_be_previewed %}
+            <i class="icon-bar-chart"></i>
+            {{ _('Preview') }}
+          {% else %}
+            <i class="icon-info-sign"></i>
+            {{ _('More information') }}
+          {% endif %}
         </a>
       </li>
       <li>
         <a href="{{ res.url }}" class="resource-url-analytics" target="_blank">
-          <i class="icon-download"></i>
-          {{ _('Download') }}
+          {% if can_be_previewed %}
+            <i class="icon-download"></i>
+            {{ _('Download') }}
+          {% else %}
+            <i class="icon-external-link"></i>
+            {{ _('Go to resource') }}
+          {% endif %}
         </a>
       </li>
       {% endblock %}