Merge branch '2941-follower-support' of github.com:okfn/ckan into 294…

…1-follower-support
ckan · Oct 4, 2012 · f6a5271 · f6a5271
2 parents a663b5c + 7ad9887
commit f6a5271
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 22 deletions.
diff --git a/ckan/public/base/javascript/modules/user-context.js b/ckan/public/base/javascript/modules/user-context.js
@@ -27,7 +27,7 @@ this.ckan.module('user-context', function($, _) {
 			loading: false,
 			authed: false,
 			url: '',
-			template: '<div class="profile-info">{{ about }}<div class="btn-group">{{ buttons }}</div><div class="nums"><dl><dt>{{ lang.followers }}</dt><dd>{{ followers }}</dd></dl><dl><dt>{{ lang.datasets }}</dt><dd>{{ datasets }}</dd></dl><dl><dt>{{ lang.edits }}</dt><dd>{{ edits }}</dd></dl></div></div>',
+			template: '<div class="profile-info">{{ about }}<div class="btn-group">{{ buttons }}</div><div class="nums"><span class="num"><strong>{{ lang.followers }}</strong><span>{{ followers }}</span></span><span class="num"><strong>{{ lang.datasets }}</strong><span>{{ datasets }}</span></span><span class="num"><strong>{{ lang.edits }}</strong><span>{{ edits }}</span></span></div></div>',
 			i18n: {
 				follow: _('Follow'),
 				unfollow: _('Unfollow'),

diff --git a/ckan/public/base/less/profile.less b/ckan/public/base/less/profile.less
@@ -65,19 +65,25 @@
 		padding-top: 10px;
 		padding-bottom: 0;
 		border-top: 1px dotted #DDD;
-		dl {
+		.num {
 			float: left;
 			width: 33%;
 			margin: 5px 0 0 0;
-			dt {
+			color: @layoutTextColor;
+			strong {
+				display: block;
 				font-weight: 300;
 			}
-			dd {
+			span {
+				display: block;
 				font-size: 30px;
 				font-weight: 700;
 				line-height: 1.2;
 				margin-left: 0;
 			}
 		}
+		a.num {
+			color: @layoutLinkColor;
+		}
 	}
 }
diff --git a/ckan/templates/user/followers.html b/ckan/templates/user/followers.html
@@ -1,21 +1,24 @@
-{% extends "page.html" %}
+{% extends "user/read.html" %}
 
 {% block subtitle %}{{ _('Followers') }}{% endblock %}
 
 {% block breadcrumb_content %}
   <li>{{ h.nav_link(_('Home'), controller='user', action='me') }}</li>
+  {% with title = _('Your Profile') if c.is_myself  else c.user_dict.display_name %}
+    <li>{% link_for title|truncate(35), controller='user', action='read', id=c.user_dict.name %}</li>
+  {% endwith %}
   <li class="active">{{ h.nav_link(_('Followers'), controller='user', action='followers', id="") }}</li>
 {% endblock %}
 
+
+
 {% block primary_content %}
   <article class="module">
     <div class="module-content">
-      <h1 class="page-heading">{{ _('{name}\'s Followers').format(name=c.user_dict.display_name) }}</h1>
-      <ul class="userlist">
+      <h1 class="page-heading">{{ _('Followers').format(name=c.user_dict.display_name) }}</h1>
+      <ul class="userlist unstyled">
         {% for follower in c.followers %}
-          <li class="user">
-            {{ h.linked_user(follower['name'], maxlength=20) }}
-          </li>
+          <li class="user">{{ h.linked_user(follower['name'], maxlength=20) }}</li>
         {% endfor %}
       </ul>
     </div>

diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html
@@ -74,18 +74,18 @@ <h1 class="heading">{{ user.fullname or _('No full name provided') }}</h1>
       </p>
     {% endif %}
     <div class="nums">
-      <dl>
-        <dt>{{ _('Followers') }}</dt>
-        <dd>{{ c.num_followers }}</dd>
-      </dl>
-      <dl>
-        <dt>{{ _('Datasets') }}</dt>
-        <dd>{{ user.number_administered_packages }}</dd>
-      </dl>
-      <dl>
-        <dt>{{ _('Edits') }}</dt>
-        <dd>{{ user.number_of_edits }}</dd>
-      </dl>
+      <a href="{{ h.url_for(controller='user', action='followers', id=user.name) }}" class="num">
+        <strong>{{ _('Followers') }}</strong>
+        <span>{{ c.num_followers }}</span>
+      </a>
+      <a href="{{ h.url_for(controller='user', action='read', id=user.name) }}" class="num">
+        <strong>{{ _('Datasets') }}</strong>
+        <span>{{ user.number_administered_packages }}</span>
+      </a>
+      <span class="num">
+        <strong>{{ _('Edits') }}</strong>
+        <span>{{ user.number_of_edits }}</span>
+      </span>
     </div>
     <div class="info">
       <dl>