Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into f…

…eature-2375-demo-theme
ckan · May 29, 2012 · c501374 · c501374
2 parents c7937b4 + fac38b2
commit c501374
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/ckan/public/base/less/ckan.less b/ckan/public/base/less/ckan.less
@@ -22,6 +22,14 @@ body {
   display: none;
 }
 
+table {
+  table-layout: fixed;
+}
+
+td, th {
+  word-wrap: break-word;
+}
+
 .popular {
   text-indent: -999em;
 }
diff --git a/ckan/public/base/less/dataset.less b/ckan/public/base/less/dataset.less
@@ -43,10 +43,10 @@
 }
 
 .results {
-  margin-right: 360px;
-  border-bottom: 1px dotted #ccc;
   margin-bottom: 20px;
+  padding-right: 360px;
   padding-bottom: 25px;
+  border-bottom: 1px dotted #ccc;
 }
 
 .results strong {

diff --git a/ckan/templates/package/read.html b/ckan/templates/package/read.html
@@ -10,9 +10,9 @@
     </head>
     <body>
       <nav class="toolbar">
-        <ol class="breadcrumb">
+        <ol class="breadcrumb" py:with="dataset = c.pkg_dict.title or c.pkg_dict.name">
           <li>${h.nav_link(_('Datasets'), controller='package', action='search', highlight_actions = 'new index')}</li>
-          <li class="active"><a href="">${c.pkg_dict.title or c.pkg_dict.name}</a></li>
+          <li class="active"><a href="" title="${dataset}">${h.truncate(dataset, 60)}</a></li>
         </ol>
         <ul class="actions">
           <li>${h.nav_link(_('History'), controller='package', action='history', id=c.pkg.id, class_='btn', icon='rewind')}</li>
@@ -41,7 +41,7 @@ <h3>Data and Resources</h3>
             <ul class="resource-list" py:if="c.pkg_dict.resources">
               <li class="resource-item" py:for="res in c.pkg_dict.resources" py:with="url=h.url_for(controller='package', action='resource_read', id=c.pkg_dict['name'], resource_id=res['id'])">
                 <a class="heading" href="${url}" title="${res.name or res.description}">
-                  ${h.resource_display_name(res)}<span class="format-label" property="dc:format" data-format="${res.format.lower() or 'data'}">${res.format}</span>
+                  ${h.truncate(h.resource_display_name(res), 50)}<span class="format-label" property="dc:format" data-format="${res.format.lower() or 'data'}">${res.format}</span>
                   <!--! TODO: Correctly pass localised views into this snippet -->
                   <py:if test="True" py:with="title=('%s views' % 10)">${h.snippet('snippets/popular.html', title=title)}</py:if>
                 </a>
@@ -101,7 +101,7 @@ <h3>Additional Info</h3>
                 </tr>
 
                 <tr py:if="h.check_access('package_update',{'id':c.pkg.id})">
-                  <td class="dataset-label">State</td>
+                  <th class="dataset-label">State</th>
                   <td class="dataset-details">${c.pkg.state}</td>
                 </tr>