[#2440] add datasets to home page

ckan · Jun 11, 2012 · 79705b6 · 79705b6
1 parent 91e662f
commit 79705b6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 34 deletions.
diff --git a/ckan/controllers/home.py b/ckan/controllers/home.py
@@ -41,13 +41,15 @@ def index(self):
             data_dict = {
                 'q':'*:*',
                 'facet.field':g.facets,
-                'rows':0,
+                'rows':10,
                 'start':0,
+                'sort':'views_recent desc',
                 'fq': 'capacity:"public"'
             }
             query = ckan.logic.get_action('package_search')(context,data_dict)
             c.search_facets = query['search_facets']
             c.package_count = query['count']
+            c.datasets = query['results']
             c.facets = query['facets']
             c.facet_titles = {'groups' : _('Groups'),
                           'tags' : _('Tags'),

diff --git a/ckan/templates/home/index.html b/ckan/templates/home/index.html
@@ -57,36 +57,7 @@ <h3 class="heading">{{ _("Search Your Data") }}</h3>
 
 {% block secondary_content %}
   <div class="">
-    <ul class="media-grid media-wide">
-      <li class="media media-vertical module">
-        <div class="content">
-          <h3 class="heading"><a href="#">Stuff</a></h3>
-          <span class="banner">Popular</span>
-          <p>Another example block</p>
-        </div>
-      </li>
-      <li class="media module">
-        <div class="content">
-          <h3 class="heading"><a href="#">Stuff</a></h3>
-          <span class="banner">Popular</span>
-          <p>Another example block</p>
-        </div>
-      </li>
-      <li class="media module">
-        <div class="content">
-          <h3 class="heading"><a href="#">Stuff</a></h3>
-          <span class="banner">Popular</span>
-          <p>Another example block</p>
-        </div>
-      </li>
-      <li class="media module">
-        <div class="content">
-          <h3 class="heading"><a href="#">Stuff</a></h3>
-          <span class="banner">Popular</span>
-          <p>Another example block</p>
-        </div>
-      </li>
-    </ul>
+      {{ h.snippet('snippets/package_list.html', packages=c.datasets, item_class='media media-vertical module', list_class='media-grid media-wide', hide_resources=True, banner=True) }}
   </div>
 {% endblock %}
 

diff --git a/ckan/templates/snippets/package_list.html b/ckan/templates/snippets/package_list.html
@@ -1,22 +1,27 @@
+{% set list_class = list_class or 'dataset-list unstyled' %}
+{% set item_class = item_class or 'dataset-item' %}
 {% if packages %}
-  <ul class="dataset-list unstyled">
+<ul class="{{ list_class }}">
     {% for package in packages %}
       {% set title = package.get('title') or package.get('name') %}
       {% set notes = h.markdown_extract(package.notes) %}
 
-      <li class="dataset-item">
+      <li class="{{ item_class }} ">
         <h3 class="heading">
           {{ h.link_to(h.truncate(title, 80), h.url_for(controller='package', action='read', id=package.get('name'))) }}
           {{ h.popular('recent views', package.tracking_summary.recent, min=10) }}
         </h3>
         <div class="content">
+          {% if banner %}
+            <span class="banner">Popular</span>
+          {% endif %}
           {% if notes %}
             {{ notes }}
           {% else %}
             <p class="empty">{{ _("This dataset has no description") }}</p>
           {% endif %}
         </div>
-        {% if package.resources %}
+        {% if package.resources and not hide_resources %}
           <ul class="dataset-resources unstyled">
             {% for resource in h.dict_list_reduce(package.resources, 'format') %}
               <li>