[ckan-changes] [okfn/ckan] d123ed: [#2304] Tweak follow buttons and follower tabs sty...

Wed Apr 25 15:39:30 UTC 2012

Branch: refs/heads/feature-2304-follow
  Home:   https://github.com/okfn/ckan
  Commit: d123ed4b9bebd789b7e0d77d1af7286c38577216
      https://github.com/okfn/ckan/commit/d123ed4b9bebd789b7e0d77d1af7286c38577216
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M ckan/templates/package/layout.html
    M ckan/templates/user/layout.html

  Log Message:
  -----------
  [#2304] Tweak follow buttons and follower tabs style and layout

diff --git a/ckan/templates/package/layout.html b/ckan/templates/package/layout.html
index aa72282..f93c29d 100644
--- a/ckan/templates/package/layout.html
+++ b/ckan/templates/package/layout.html
@@ -35,7 +35,7 @@
       </py:otherwise>
       </py:choose>
       <li class="${'active' if c.action=='history' else ''}">${h.subnav_link(h.icon('page_stack') + _('History'), controller='package', action='history', id=c.pkg.name)}</li>
-      <li class="${'active' if c.action=='followers' else ''}">
+      <li class="${'active' if c.action=='followers' else ''}" style="float:right;">
         ${h.subnav_link(
             h.icon('authorization_group') + _('Followers ({num_followers})').format(num_followers=c.num_followers),
             controller='package', 
@@ -51,10 +51,10 @@
       <li class="${'active' if c.action=='authz' else ''}" py:if="h.check_access('package_edit_permissions',{'id':c.pkg.id})">
         ${h.subnav_link(h.icon('lock') + _('Authorization'), controller='package', action='authz', id=c.pkg.name)}
       </li>
-      <li py:if="c.authorized_to_follow">
+      <li py:if="c.authorized_to_follow" style="float:right;">
         <py:choose test="c.pkg_dict.am_following">
-          <button py:when="True" package_id="${c.pkg.id}" state="unfollow" id="dataset_follow_button" class="btn">Unfollow</button>
-          <button py:otherwise="" package_id="${c.pkg.id}" state="follow" id="dataset_follow_button" class="btn">Follow</button>
+          <a py:when="True" package_id="${c.pkg.id}" state="unfollow" id="dataset_follow_button" class="btn btn-mini">Unfollow</a>
+          <a py:otherwise="" package_id="${c.pkg.id}" state="follow" id="dataset_follow_button" class="btn btn-mini">Follow</a>
         </py:choose>
       </li>
     </ul>
diff --git a/ckan/templates/user/layout.html b/ckan/templates/user/layout.html
index 17d6f80..fa2e164 100644
--- a/ckan/templates/user/layout.html
+++ b/ckan/templates/user/layout.html
@@ -15,17 +15,17 @@
       <py:otherwise>
         <py:if test="c.id">
           <li class="${'active' if c.action=='read' else ''}"><a href="${h.url_for(controller='user', action='read', id=c.user_dict.name)}">View Profile</a></li>
-          <li class="${'active' if c.action=='followers' else ''}">
+          <li style="float:right;" class="${'active' if c.action=='followers' else ''}">
             ${h.subnav_link(
                 h.icon('authorization_group') + _('Followers ({num_followers})').format(num_followers=c.num_followers),
                 controller='user',
                 action='followers',
                 id=c.user_dict.name)}
           </li>
-          <li py:if="c.authorized_to_follow">
+          <li style="float:right;" py:if="c.authorized_to_follow">
             <py:choose test="c.user_dict.am_following">
-              <button py:when="True" userid="${c.user_dict.id}" id="user_follow_button" state="unfollow" class="btn">Unfollow</button>
-              <button py:otherwise="" userid="${c.user_dict.id}" id="user_follow_button" state="follow" class="btn">Follow</button>
+              <a py:when="True" userid="${c.user_dict.id}" id="user_follow_button" state="unfollow" class="btn btn-mini">Unfollow</a>
+              <a py:otherwise="" userid="${c.user_dict.id}" id="user_follow_button" state="follow" class="btn btn-mini">Follow</a>
             </py:choose>
           </li>
         </py:if>


================================================================

