[ckan-changes] commit/ckan: 3 new changesets

[Bitbucket]

3 new changesets in ckan:

http://bitbucket.org/okfn/ckan/changeset/6b3f57945e0a/
changeset:   6b3f57945e0a
branch:      feature-1348-ux-tweaks
user:        zephod
date:        2011-09-17 14:35:02
summary:     [ux,dataset/edit][s]: The edit summary shows a name, not a description.
affected #:  2 files (-1 bytes)

--- a/ckan/public/scripts/templates.js	Fri Sep 16 21:03:51 2011 +0100
+++ b/ckan/public/scripts/templates.js	Sat Sep 17 13:35:02 2011 +0100
@@ -80,12 +80,12 @@
   <td class="resource-summary resource-url"> \
     ${resource.url} \
   </td> \
+  <td class="resource-summary resource-name"> \
+    ${resource.name} \
+  </td> \
   <td class="resource-summary resource-format"> \
     ${resource.format} \
   </td> \
-  <td class="resource-summary resource-description"> \
-    ${resource.description} \
-  </td> \
   <td class="resource-expanded" colspan="3"> \
     <div class="inner"> \
     <table> \
@@ -97,8 +97,8 @@
       </thead> \
       <tbody> \
       <tr> \
-      <td style="display: none;" class="form-label">Name</td> \
-      <td style="display: none;" class="form-value" colspan="3"> \
+      <td class="form-label">Name</td> \
+      <td class="form-value" colspan="3"> \
         <input name="resources__${num}__name" type="text" value="${resource.name}" class="long" /> \
       </td> \
       </tr> \


--- a/ckan/templates/package/new_package_form.html	Fri Sep 16 21:03:51 2011 +0100
+++ b/ckan/templates/package/new_package_form.html	Sat Sep 17 13:35:02 2011 +0100
@@ -93,8 +93,8 @@
       <tr><th class="resource-expand-link"></th><th class="field_req resource-url">URL*</th>
+        <th class="field_opt resource-description">Name</th><th class="field_opt resource-format">Format</th>
-        <th class="field_opt resource-description">Description</th><th class="field_opt resource-is-changed"></th></tr></thead>
@@ -108,12 +108,12 @@
         <td class="resource-summary resource-url">
           ${res.get('url', '')}
         </td>
+        <td class="resource-summary resource-name">
+          ${res.get('name', '')}
+        </td><td class="resource-summary resource-format">
           ${res.get('format', '')}
         </td>
-        <td class="resource-summary resource-description">
-          ${res.get('description', '')}
-        </td><td class="resource-expanded" colspan="3" style="display: none;"><dl><dt><label class="field_opt">Url</label></dt>


http://bitbucket.org/okfn/ckan/changeset/1aab499d73db/
changeset:   1aab499d73db
branch:      feature-1348-ux-tweaks
user:        zephod
date:        2011-09-17 16:08:24
summary:     [ux,dataset/edit][s]: Dataset view shows 'Name/Description'; looks more like edit table.
affected #:  1 file (-1 bytes)

--- a/ckan/templates/package/read_core.html	Sat Sep 17 13:35:02 2011 +0100
+++ b/ckan/templates/package/read_core.html	Sat Sep 17 15:08:24 2011 +0100
@@ -14,21 +14,27 @@
     <div class="resources subsection"><h3>Resources</h3><table>
-        <tr>
-            <th>Description</th>
+        <thead>
+            <th>Url</th>
+            <th>Name/Description</th><th>Format</th>
-        </tr>
+        </thead><py:for each="res in c.pkg_dict.get('resources', [])"><tr rel="dcat:distribution" resource="_:res${res.id}"
             typeof="dcat:Distribution"><td>
+                <a href="${res.get('url', '')}" target="_blank">${res.get('url', '')}</a>  
+              </td>
+              <td><py:choose test="">
+                    <py:when test="res.get('name')">
+                      <span property="rdfs:label">${res.name}</span>
+                    </py:when><py:when test="res.get('description')">
-                    <a href="${res.get('url', '')}" rel="dcat:accessURL" target="_blank"><span
-                        property="rdfs:label">${res.description}</span></a>  
+                      <span property="rdfs:label">${res.description}</span></py:when><py:otherwise test="">
-                      <a href="${res.get('url', '')}" target="_blank">Download <em>(no description)</em></a>  
+                      <em>(none)</em></py:otherwise></py:choose></td>


http://bitbucket.org/okfn/ckan/changeset/fde26b87d6ce/
changeset:   fde26b87d6ce
branch:      feature-1348-ux-tweaks
user:        zephod
date:        2011-09-17 16:09:39
summary:     [ux,dataset/edit][xs]: API placeholder should not point at a CSV file.
affected #:  1 file (-1 bytes)

--- a/ckan/public/scripts/templates.js	Sat Sep 17 15:08:24 2011 +0100
+++ b/ckan/public/scripts/templates.js	Sat Sep 17 15:09:39 2011 +0100
@@ -35,7 +35,7 @@
         </label> \
       </dt> \
       <dd> \
-        <input name="url" type="text" placeholder="http://mydataset.com/file.csv" style="width: 60%" /> \
+        <input name="url" type="text" placeholder="http://mydataset.com/api/" style="width: 60%" /> \
         <input name="save" type="submit" class="pretty-button primary" value="Add" /> \
         <input name="reset" type="reset" class="pretty-button" value="Cancel" /> \
       </dd> \

Repository URL: https://bitbucket.org/okfn/ckan/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.