Merge branch '817-facet-tooltips'

ckan · Apr 24, 2013 · 0c8fd56 · 0c8fd56
2 parents aa89102 + 87b3e80
commit 0c8fd56
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ckan/templates/snippets/facet_list.html b/ckan/templates/snippets/facet_list.html
@@ -57,11 +57,12 @@ <h2 class="module-heading">
           <ul class="{{ nav_class or 'unstyled nav nav-simple nav-facet' }}">
             {% for item in items %}
               {% set href = h.remove_url_param(name, item.name, extras=extras, alternative_url=alternative_url) if item.active else h.add_url_param(new_params={name: item.name}, extras=extras, alternative_url=alternative_url) %}
-              {% set label = label_function(item) if label_function else h.truncate(item.display_name, 22) %}
+              {% set label = label_function(item) if label_function else item.display_name %}
+              {% set label_truncated = h.truncate(label, 22) if not label_function else label %}
               {% set count = count_label(item['count']) if count_label else ('(%d)' % item['count']) %}
                 <li class="{{ nav_item_class or 'nav-item' }}{% if item.active %} active{% endif %}">
-                  <a href="{{ href }}">
-                    <span>{{ label }} {{ count }}</span>
+                  <a href="{{ href }}" title="{{ label if label != label_truncated else '' }}">
+                    <span>{{ label_truncated }} {{ count }}</span>
                   </a>
                 </li>
             {% endfor %}