Merge branch 'master' of ssh://github.com/okfn/ckan

ckan/config/routing.py

@@ -276,6 +276,7 @@ def make_map():
     map.connect('/tag/{id}', controller='tag', action='read')
     # users
     map.redirect("/users/{url:.*}", "/user/{url}")
+    map.redirect("/user/", "/user")
     map.connect('/user/edit', controller='user', action='edit')
     # Note: openid users have slashes in their ids, so need the wildcard
     # in the route.

ckan/public/scripts/vendor/recline/css/data-explorer.css

@@ -25,11 +25,6 @@
   width: 30px;
 }
 
-.doc-count {
-  font-weight: bold;
-  font-size: 120%;
-}
-
 .data-view-container {
   display: block;
   clear: both;
@@ -132,6 +127,11 @@
   * Data Table
   *********************************************************/
 
+.data-table-container {
+  overflow: auto;
+  height: 550px;
+}
+
 .data-table {
   border: 1px solid #ccc;
   font-size: 12px;

ckan/public/scripts/vendor/recline/recline.js

@@ -1045,7 +1045,7 @@ my.DataExplorer = Backbone.View.extend({
       </ul> \
       <div class="pagination"> \
         <form class="display-count"> \
-          Showing 0 to <input name="displayCount" type="text" value="{{displayCount}}" /> of  <span class="doc-count">{{docCount}}</span> \
+          Showing 0 to <input name="displayCount" type="text" value="{{displayCount}}" title="Edit and hit enter to change the number of rows displayed" /> of  <span class="doc-count">{{docCount}}</span> \
         </form> \
       </div> \
     </div> \
@@ -1067,7 +1067,7 @@ my.DataExplorer = Backbone.View.extend({
     var self = this;
     this.el = $(this.el);
     this.config = _.extend({
-        displayCount: 10
+        displayCount: 50
         , readOnly: false
       },
       options.config);

ckan/templates/user/edit.html

@@ -5,7 +5,7 @@
 
   <py:def function="page_title">${c.user} - Edit - User</py:def>
   <py:def function="page_heading">
-      Edit User: ${c.userobj.display_name}
+      Edit User: ${c.user_name}
   </py:def>
 
   <div py:match="content">