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

ckan/forms/group.py

@@ -49,7 +49,7 @@ def render(self, **kwargs):
 
 def build_group_form(is_admin=False, with_packages=False):
     builder = FormBuilder(model.Group)
-    builder.set_field_text('name', _('Name'), literal("<br/><strong>Unique identifier</strong> for group.<br/>2+ chars, lowercase, using only 'a-z0-9' and '-_'"))
+    builder.set_field_text('name', _('Name'), literal("<strong>Unique identifier</strong> for group.<br/>2+ chars, lowercase, using only 'a-z0-9' and '-_'<p></p>"))
     builder.set_field_option('name', 'validate', common.group_name_validator)
     builder.set_field_option('description', 'textarea', {'size':'60x15'})
     builder.add_field(ExtrasField('extras', hidden_label=True))

ckan/public/css/style.css

@@ -207,6 +207,35 @@ tbody tr.table-empty td {
   font-size: 2.2em;
   font-weight: normal;
 }
+.hover-for-help {
+  position: relative;
+}
+.hover-for-help > .help-text {
+  position: absolute;
+  top: 24px;
+  left: -90px;
+  display: none;
+  padding: 2px 8px;
+  font-size: 11px;
+  background: #333;
+  text-align: left;
+  width: 250px;
+  z-index: 3;
+  color: #fff;
+}
+.hover-for-help > .help-text > span {
+  display: block;
+  padding: 2px 0;
+}
+.hover-for-help > .help-text > span.fail {
+  color: #999;
+}
+.hover-for-help:hover > .help-text {
+  display: block;
+}
+.semi-link {
+  border-bottom: 1px dashed #000;
+}
 
 
 /* =============== */
@@ -1129,10 +1158,13 @@ body.package.read h3 {
 .search-result .main-link {
   font-size: 125%;
 }
-.search-result .view-more-link {
+.search-result .extra-links {
   float: right;
+}
+.search-result .view-more-link {
   color: #000;
-  text-align: middle;
+  display: block;
+  text-align: right;
   margin-top: 4px;
   padding: 3px 22px 3px 10px;
   background: url('/images/icons/arrow-right-16-black.png') no-repeat right;

ckan/templates/facets.html

@@ -5,9 +5,9 @@
   py:strip=""
   >
 
-<py:def function="facet_sidebar(code, limit=5, label=lambda n: n)">
+<py:def function="facet_sidebar(code, limit=5, label=lambda n: n, title=h.facet_title)">
     <div py:if="len(h.facet_items(c, code, limit=limit))" class="facet-box">
-        <h2>${h.facet_title(code)}</h2>
+        <h2>${title(code)}</h2>
         <ul class="facet-options">
             <li py:for="name, count in h.facet_items(c, code, limit=limit)"
                 py:if="not (code, name) in c.fields">

ckan/templates/package/read_core.html

@@ -18,8 +18,10 @@
       <div id="dataset-resources" class="resources subsection">
         <h3>Resources</h3>
         <py:for each="res in c.pkg_dict.get('resources', [])">
-          <div class="search-result">
-            <a class="view-more-link" href="${h.url_for(controller='package', action='resource_read', id=c.pkg_dict['name'], resource_id=res['id'])}">View</a>
+          <div class="search-result" id="${res['id']}">
+            <p class="extra-links">
+              <a class="view-more-link" href="${h.url_for(controller='package', action='resource_read', id=c.pkg_dict['name'], resource_id=res['id'])}">View</a>
+            </p>
             <a class="main-link" href="${h.url_for(controller='package', action='resource_read', id=c.pkg_dict['name'], resource_id=res['id'])}">${h.resource_display_name(res)}</a>
             &nbsp;&nbsp;
             <span py:if="res.get('format')" class="format-box" property="dc:format">${res.get('format')}</span>

ckan/templates/package/resource_read.html

@@ -45,7 +45,7 @@
         </a>
     </div>
 
-    <div class="quick-info .span-8">
+    <div class="quick-info">
       <dl>
         <dt>Part of dataset</dt>
         <dd>

doc/paster.rst

@@ -233,4 +233,4 @@ For example, to create a new user called 'admin'::
 
 To delete the 'admin' user::
 
- paster --plugin=ckan user delete admin --config=/etc/ckan/std/std.ini
+ paster --plugin=ckan user remove admin --config=/etc/ckan/std/std.ini