[ckan-changes] commit/ckan: zephod: [welcome][s]: Show welcome bar on dataset view rather than sidebar thing.

Fri Oct 21 16:36:06 UTC 2011

1 new changeset in ckan:

http://bitbucket.org/okfn/ckan/changeset/fe81728e6097/
changeset:   fe81728e6097
branch:      release-v1.5
user:        zephod
date:        2011-10-21 18:35:59
summary:     [welcome][s]: Show welcome bar on dataset view rather than sidebar thing.
affected #:  2 files (-1 bytes)

--- a/ckan/public/scripts/application.js	Fri Oct 21 17:25:08 2011 +0100
+++ b/ckan/public/scripts/application.js	Fri Oct 21 17:35:59 2011 +0100
@@ -19,24 +19,26 @@
     };
 
     var isFrontPage = $('body.index.home').length > 0;
-    if (isFrontPage) {
+    var isDatasetView = $('body.package.read').length > 0;
+    var isDatasetNew = $('body.package.new').length > 0;
+    var isGroupNew = $('body.group.new').length > 0;
+
+    // Two main entrance-points to the site:
+    if (isFrontPage || isDatasetView) {
       CKAN.Utils.setupTopBar($('.top-bar'));
     }
 
-    var isDatasetView = $('body.package.read').length > 0;
     if (isDatasetView) {
       var _dataset = new CKAN.Model.Dataset(preload_dataset);
       CKANEXT.DATAPREVIEW.setupDataPreview(_dataset);
     }
 
-    var isDatasetNew = $('body.package.new').length > 0;
     if (isDatasetNew) {
       // Set up magic URL slug editor
       CKAN.Utils.setupUrlEditor('package');
       $('#save').val(CKAN.Strings.addDataset);
       $("#title").focus();
     }
-    var isGroupNew = $('body.group.new').length > 0;
     if (isGroupNew) {
       // Set up magic URL slug editor
       CKAN.Utils.setupUrlEditor('group');


--- a/ckan/templates/package/read.html	Fri Oct 21 17:25:08 2011 +0100
+++ b/ckan/templates/package/read.html	Fri Oct 21 17:35:59 2011 +0100
@@ -18,13 +18,6 @@
   
   <py:match path="primarysidebar">
   
-    <li class="widget-container boxed widget_text" py:if="not c.hide_welcome_message">
-      <h3>First time at ${g.site_title}?</h3>        
-      <p>
-          ${g.site_title} is a catalogue for data. ${h.subnav_link(c, _('Click here to find out more ...'), controller='home', action='about', id=None)}
-      </p>
-    </li>
-
     <li class="widget-container widget_text"><ul class="property-list"><li py:if="c.pkg.url">

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.


