Merge branch 'master' into gh-pages

okfn · Jul 24, 2011 · 579ed4d · 579ed4d
2 parents ad41b11 + 5ddf390
commit 579ed4d
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 76 deletions.
diff --git a/TODO.txt b/TODO.txt
@@ -1,3 +1,6 @@
+2011-07-24 change dataset-tags selector to just tags or something else ...
+
+
 ##############################
 ## DONE
 

diff --git a/app/css/ckanjs.css b/app/css/ckanjs.css
@@ -63,62 +63,22 @@ ul.actions li {
 }
 
 /****************************************
-  * Config
+  * Dataset View
   ***************************************/
 
-#config-form input {
-  line-height: 12px;
+.dataset.view .tags {
+  margin-top: 10px;
+  margin-bottom: 10px;
 }
 
 /****************************************
-  * Site Layout Fixes to Core CKAN CSS
+  * Config
   ***************************************/
 
-#sitetitle {
-  width: 400px;
-}
-
-#access {
-  float: right;
-  clear: right;
-  margin-top: 5px;
-  padding: 4px 0px;
-  width: auto;
-  border: none;
-	-moz-border-radius: 0.5em;
-	-webkit-border-radius: 0.5em;
-  border-radius: 0.5em;
-  background: #f1f1f1;
-}
-
-#access .menu-header, div.menu {
-  width: auto;
-}
-
-#access div.menu li {
-  border-right: solid 1px #ccc;
-  border-left: solid 1px #d2d2d2;
-  padding: 4px 5px;
-}
-
-#access div.menu li.first {
-  border-left: none;
-}
-
-#access div.menu li.last {
-  border-right: none;
-}
-
-#access a {
-  line-height: 18px;
-  text-shadow: white 1px 1px 0;
-}
-
-#access li:hover > a, #access ul ul :hover > a {
-  background: none;
+#config-form input {
+  line-height: 12px;
 }
 
-
 /****************************************
   * Forms
   ***************************************/

diff --git a/app/css/pdeu.css b/app/css/pdeu.css
@@ -177,7 +177,7 @@ a:hover {
 /* Side bar widgets */
 ul.widget-list {
   list-style: none;
-  padding-left: 0px;
+  padding-right: 0px;
 }
 
 ul.widget-list li.widget-container {
@@ -257,9 +257,9 @@ table caption {
 }
 
 #sidebar {
-  border-right: 1px solid #e0e0e0;
-  margin-right: -10px;
-  padding-right: 9px;
+  border-left: 1px solid #e0e0e0;
+  padding-left: 9px;
+  margin-left: 30px;
   overflow: hidden;
 }
 
@@ -569,49 +569,49 @@ form.package-search input.search {
 /* = Package listing = */
 /* =================== */
 
-ul.packages {
+ul.datasets {
 	padding-left: 0;
     margin: 0 0 1em 0;
 }
 
-.packages .header {
+.datasets .header {
     padding-top: 0.5em;
     font-weight: bold;
     font-size: 1.1em;
 }
 
-.packages .extract {
+.datasets .extract {
 	padding-top: 0.3em;
 }
 
-.packages li {
+.datasets li {
 	list-style: none;
 	padding: 1em 0 0.2em 0.0em;
 	border-bottom: 1px solid #ececec;
 	overflow: hidden;
 	/*white-space: nowrap;*/
 }
 
-.packages li a {
+.datasets li a {
 	text-decoration: none;
 }
 
-.packages li img {
+.datasets li img {
 	margin-bottom: -2px;
 }
 
 .search_meta {
     float:right;
 }
 
-ul.package_formats {
+ul.dataset_formats {
     float: right;
     padding: 0 0 3px 0; 
     margin: 0;
     font-family: monospace;
 }
 
-ul.package_formats li {
+ul.dataset_formats li {
     display: inline;
     margin: 0;
     padding: 0 5px 0 5px;

diff --git a/app/css/style.css b/app/css/style.css
@@ -5,11 +5,8 @@ img#logo {
   width: 64px;
 }
 
-.page-heading {
-  display: none;
-}
-
 .account {
   display: none;
 }
 
+
diff --git a/app/index.html b/app/index.html
@@ -104,10 +104,9 @@
     <div id="main" class="container" role="main">
       <h1 class="page-heading">Page Heading</h1>
       <div id="minornavigation" class="span-24 last">
-          <minornavigation></minornavigation>
       </div>
 
-      <div id="content" class="span-16 prepend-1 last">
+      <div id="content" class="span-16 first">
 
         <div id="config-page" class="page-view" style="display: none;">
           <div id="config-form">
@@ -160,7 +159,7 @@ <h3>Results</h3>
 
       </div> <!-- / content -->
 
-      <div id="sidebar" class="span-7">
+      <div id="sidebar" class="span-7 last">
         <ul class="widget-list">
         </ul>
       </div>

diff --git a/lib/templates.js b/lib/templates.js
@@ -2,7 +2,7 @@ var CKAN = CKAN || {};
 
 CKAN.Templates = {
   datasetSummary: '  \
-  <li class="dataset" dataset-id="${dataset.id}"> \
+  <li class="dataset summary" dataset-id="${dataset.id}"> \
     <div class="header"> \
       <span class="title" > \
         <a href="${domain}${dataset.ckan_url}" ckan-attrname="title" class="editable">${dataset.displaytitle}</a> \
@@ -42,14 +42,12 @@ CKAN.Templates = {
   ',
 
   datasetFull: ' \
-  <div class="dataset" dataset-id="${dataset.id}"> \
-    <h2 class="title" > \
-      <a href="${dataset.ckan_url}" ckan-attrname="title" class="editable">${dataset.displaytitle}</a> \
-    </h2> \
-    <div class="extract editable-area"> \
-      {{html dataset.notesHtml}} \
+  <div class="dataset view" dataset-id="${dataset.id}"> \
+    <div class="extract"> \
+      {{html dataset.snippet}} \
+      <a href="#anchor-notes">Read more</a> \
     </div> \
-    <div class="dataset-tags"> \
+    <div class="tags"> \
       {{if dataset.tags.length}} \
       <ul class="dataset-tags"> \
         {{each dataset.tags}} \
@@ -60,12 +58,11 @@ CKAN.Templates = {
     </div> \
     <div class="resources subsection"> \
     {{if dataset.resources.length }} \
-      <h3>Downloads &amp; Resources</h3> \
+      <h3>Resources</h3> \
       <table> \
         <tr> \
           <th>Description</th> \
           <th>Format</th> \
-          <th>Hash</th> \
         </tr> \
         {{each dataset.resources}} \
         <tr> \
@@ -86,6 +83,37 @@ CKAN.Templates = {
         <div class="add-resource-form"></div> \
       </div> \
     </div> \
+    <div class="notes subsection"> \
+      <h3 id="anchor-notes">Notes</h3> \
+      {{html dataset.notesHtml}} \
+    </div> \
+    <div class="details subsection"> \
+      <h3>Additional Information</h3> \
+      <table> \
+        <thead> \
+          <tr> \
+            <th>Field</th> \
+            <th>Value</th> \
+          </tr> \
+        </thead> \
+        <tbody> \
+          <tr> \
+            <td>Creator</td> \
+            <td>${dataset.author}</td> \
+          </tr> \
+          <tr> \
+            <td>Maintainer</td> \
+            <td>${dataset.maintainer}</td> \
+          </tr> \
+          {{each dataset.extras}} \
+          <tr> \
+            <td class="package-label" property="rdfs:label">${$index}</td> \
+            <td class="package-details" property="rdf:value">${$value}</td> \
+          </tr> \
+          {{/each}} \
+        </tbody> \
+      </table> \
+    </div> \
   </div> \
   ',
 
@@ -250,5 +278,35 @@ CKAN.Templates = {
       under the open license specified on the <a href="http://ckan.net/license">license page</a>. Please <strong>refrain</strong> from editing if you are <strong>not</strong> happy to do this. \
     </p> \
   </form> \
+  ',
+
+  minorNavigationDataset: ' \
+    <ul class="tabbed"> \
+      <li><a href="#view">View</a></li> \
+      <li><a href="#edit">Edit</a></li> \
+      <li><a href="#history">History</a></li> \
+      <li><a href="#subscribe">Subscribe</a></li> \
+    </ul> \
+    ',
+
+  sidebarDatasetView: ' \
+    <li class="widget-container widget_text"> \
+      <h3>Connections</h3> \
+      <ul> \
+        {{each dataset.relationships}} \
+        <li> \
+          <a href="...">${$value.package}</a> \
+          {{if $value.comment}} \
+          <span class="relationship_comment"> \
+            (${$value.comment}) \
+          </span> \
+          {{/if}} \
+        </li> \
+        {{/each}} \
+      </ul> \
+      {{if dataset.relationships.length == 0}} \
+      No connections to other datasets. \
+      {{/if}} \
+    </li> \
   '
 };
diff --git a/lib/ui.js b/lib/ui.js
@@ -69,6 +69,8 @@ CKAN.UI = function($) {
     },
 
     search: function(query, page) {
+      $('.page-heading').html('Search');
+      $('#sidebar .widget-list').empty();
       this.switchView('search');
     },
 
@@ -113,6 +115,8 @@ CKAN.UI = function($) {
     },
 
     add: function() {
+      $('.page-heading').html('Add Dataset');
+      $('#sidebar .widget-list').empty();
       this.switchView('add');
     },
 

diff --git a/lib/view.js b/lib/view.js
@@ -142,6 +142,9 @@ CKAN.View = function($) {
         domain: this.options.domain,
         dataset: this.model.toTemplateJSON(),
       };
+      $('.page-heading').html(tmplData.dataset.displaytitle);
+      $('#minornavigation').html($.tmpl(CKAN.Templates.minorNavigationDataset, tmplData));
+      $('#sidebar .widget-list').html($.tmpl(CKAN.Templates.sidebarDatasetView, tmplData));
       this.el.html($.tmpl(CKAN.Templates.datasetFull, tmplData));
       return this;
     },