Merge pull request #31 from davidbgk/30-fix-followers-displayed

Fix the number of followers displayed on org pages, fix #30
opendatateam · May 26, 2015 · 9471dda · 9471dda
2 parents 8c9cab2 + 5d244cd
commit 9471dda
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 10 deletions.
diff --git a/udata/core/organization/views.py b/udata/core/organization/views.py
@@ -74,7 +74,6 @@ def can(self, *args, **kwargs):
 @blueprint.route('/<org:org>/', endpoint='show')
 class OrganizationDetailView(OrgView, DetailView):
     template_name = 'organization/display.html'
-    nb_followers = 16
     page_size = 9
 
     def get_context(self):
@@ -94,7 +93,7 @@ def get_context(self):
             'reuses': reuses.paginate(1, self.page_size),
             'datasets': datasets.paginate(1, self.page_size),
             'supplied_datasets': supplied_datasets[:self.page_size],
-            'followers': followers[:self.nb_followers],
+            'followers': followers,
             'can_edit': can_edit,
             'can_view': can_view,
             'private_reuses': list(Reuse.objects(organization=self.object).hidden()) if can_view else [],

diff --git a/udata/static/js/dataset/display.js b/udata/static/js/dataset/display.js
@@ -29,12 +29,12 @@ define([
             // Prevent default click on link
             $this.find('a[itemprop="url"]').click(function(e) {
                 e.preventDefault();
-            })
+            });
 
             // Ensure toolbar links does not interfere
             $this.find('.tools a').click(function(e) {
                 e.stopPropagation();
-            })
+            });
 
             // Display detailled informations in a modal
             $this.click(function() {
@@ -137,7 +137,7 @@ define([
         } else if ($el.data('zones')) {
             $.get($el.data('zones'), function(data) {
                 loadJson(map, layer, data);
-            })
+            });
         }
     }
 
@@ -170,5 +170,5 @@ define([
             prepare_resources();
             fetch_reuses();
         }
-    }
+    };
 });
diff --git a/udata/static/js/organization/display.js b/udata/static/js/organization/display.js
@@ -52,6 +52,15 @@ define([
             return false;
         });
 
+
+        function displayFollowers(e) {
+            e.preventDefault();
+            var $parent = $(this).parent();
+            $parent.siblings('.col-md-4').removeClass('hidden');
+            $parent.remove();
+        }
+        $('.display-followers').click(displayFollowers);
+
     return {
         start: function() {
             log.debug('Organization display page');
@@ -61,8 +70,9 @@ define([
                 $('a[href="' + location.hash + '"]').tab('show');
             }
             $('a[data-toggle="tab"]').on('shown.bs.tab', function(e) {
-                return location.hash = $(e.target).attr('href').substr(1);
+                e.preventDefault();
+                location.hash = $(e.target).attr('href').substr(1);
             });
         }
-    }
+    };
 });
diff --git a/udata/templates/organization/display.html b/udata/templates/organization/display.html
@@ -163,10 +163,20 @@ <h1>
         <div id="followers" class="tab-pane">
             <div class="row card-list">
                 {% for follow in followers %}
-                <div class="col-md-4">
-                  {% include theme('follow/follower-card.html') %}
+                <div class="col-md-4{% if loop.index > 15 %} hidden{% endif %}">
+                    {% include theme('follow/follower-card.html') %}
                 </div>
                 {% endfor %}
+                {% if followers|length > 15 %}
+                    <div class="clearfix"></div>
+                    <p class="text-center">
+                        <a class="btn btn-default display-followers"
+                            href="#">
+                            <span class="glyphicon glyphicon-list" ></span>
+                            {{ _('Display all followers') }}
+                        </a>
+                    </p>
+                {% endif %}
             </div>
         </div>
         {% endif %}