From cbf3347efff117f9a685c0c74743fbfee09be561 Mon Sep 17 00:00:00 2001 From: albert Date: Sat, 6 Aug 2011 17:28:20 -0400 Subject: [PATCH] added news ticker --- app/assets/javascripts/cookie.js | 14 +++++++--- app/assets/stylesheets/application.css.scss | 29 +++++++++++++++++++++ app/views/layouts/default.html.erb | 2 ++ app/views/news/_listing.html.erb | 6 +++++ 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 app/views/news/_listing.html.erb diff --git a/app/assets/javascripts/cookie.js b/app/assets/javascripts/cookie.js index 9c82ccce5..31ee60a08 100644 --- a/app/assets/javascripts/cookie.js +++ b/app/assets/javascripts/cookie.js @@ -51,10 +51,18 @@ return; } + if (this.get("hide-news-ticker") == "1") { + $("#news-ticker").hide(); + } else { + $("#close-news-ticker-link").observe("click", function(e) { + $("#news-ticker").hide(); + this.put("hide-news-ticker", "1", 1); + return false; + }); + } + if (this.get("hide-upgrade-account") != "1") { - if ($("upgrade-account")) { - $("upgrade-account").show(); - } + $("#upgrade-account").show(); } } })(); diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss index 6ff47eb82..129da4351 100644 --- a/app/assets/stylesheets/application.css.scss +++ b/app/assets/stylesheets/application.css.scss @@ -1046,3 +1046,32 @@ div#moderator-dashboard { font-size: 1.5em; } } + + + +/*** news ticker ***/ + +div#news-ticker { + padding: 5px; + background: #EEE; + border-bottom: 2px solid #666; + overflow: hidden; + font-size: 0.8em; + + ul { + float: left; + margin: 0; + padding: 0; + } + + li { + list-style-type: none; + float: left; + margin: 0 2em 0 0; + padding: 0; + } + + a#close-news-ticker-link { + float: right; + } +} \ No newline at end of file diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb index 1ed3e6d0e..49f683caa 100644 --- a/app/views/layouts/default.html.erb +++ b/app/views/layouts/default.html.erb @@ -22,6 +22,8 @@
+ <%= render "news/listing" %> +

<%= link_to Danbooru.config.app_name, "/" %>