[ckan-changes] commit/ckan: zephod: [welcome][s]: Changed welcome banner colour. Disabled animation.

Tue Oct 25 18:43:56 UTC 2011

1 new commit in ckan:


https://bitbucket.org/okfn/ckan/changeset/9f02da7ab51c/
changeset:   9f02da7ab51c
user:        zephod
date:        2011-10-25 20:43:49
summary:     [welcome][s]: Changed welcome banner colour. Disabled animation.
affected #:  3 files

diff -r 494bbd08364f0d9ad9e4fc371ac4ea1ff487d716 -r 9f02da7ab51c65b9b0d549177243cf88a33a872f ckan/public/css/style.css

--- a/ckan/public/css/style.css
+++ b/ckan/public/css/style.css
@@ -1234,7 +1234,6 @@
   width: 100%;
   /* Old background was a little less intrusive */
   background: #fcba63;
-  background: #b22;
   text-align: center;
   padding: 0;
   border-bottom: 1px solid #faa;
@@ -1242,10 +1241,8 @@
 }
 .top-bar-text {
   line-height: 30px;
-  color: #fff;
 }
 .top-bar-text a {
-  color: #fff;
   text-decoration: underline;
 }
 .top-bar button.js-kill-button {


diff -r 494bbd08364f0d9ad9e4fc371ac4ea1ff487d716 -r 9f02da7ab51c65b9b0d549177243cf88a33a872f ckan/public/scripts/application.js
--- a/ckan/public/scripts/application.js
+++ b/ckan/public/scripts/application.js
@@ -109,20 +109,16 @@
   my.setupTopBar = function(topBar) {
 
     var cookieName = 'ckan_killtopbar';
-    var delay = 600;
-    var animTime = 600;
     var isKilled = ($.cookie(cookieName)!=null);
-    if (isKilled) return;
-
-    // Show the top bar after a short timeout
-    setTimeout("CKAN.Utils.animateHeight($('.top-bar'),"+animTime+")",delay);
-
-    // Bind to the close button
-    topBar.find('.js-kill-button').live('click', function() {
-      console.log('killing top-bar');
-      $.cookie(cookieName, 'true', { expires: 365 });
-      topBar.hide();
-    });
+    if (!isKilled) {
+      topBar.show();
+      // Bind to the close button
+      topBar.find('.js-kill-button').live('click', function() {
+        console.log('killing top-bar');
+        $.cookie(cookieName, 'true', { expires: 365 });
+        topBar.hide();
+      });
+    }
   };
 
   my.setupUrlEditor = function(slugType,readOnly) {


diff -r 494bbd08364f0d9ad9e4fc371ac4ea1ff487d716 -r 9f02da7ab51c65b9b0d549177243cf88a33a872f ckan/templates/layout_base.html
--- a/ckan/templates/layout_base.html
+++ b/ckan/templates/layout_base.html
@@ -48,7 +48,7 @@
              ${request.environ.get('pylons.routes_dict', {}).get('controller').split(':')[-1]}"><div class="top-bar" style="display: none;"><span class="top-bar-text">First time at ${g.site_url_nice}? Visit our <a href="${h.url_for(controller='home', action='about')}">About page</a> to find out more.</span>
-     <button class="pretty-button danger js-kill-button">x</button>
+     <button class="pretty-button js-kill-button">x</button></div><div id="wrap"><div class="header outer">

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.


