From e709eba243a96ce668c67f7d2015ddebedc49b79 Mon Sep 17 00:00:00 2001 From: danielvincent Date: Sat, 3 Jul 2010 22:43:11 -0700 Subject: [PATCH] publisher as a faux nav element. --- app/views/dashboard/index.html.haml | 1 - app/views/layouts/application.html.haml | 5 +- app/views/shared/_publisher.haml | 107 +++++++---------------- public/javascripts/publisher.js | 7 +- public/stylesheets/application.css | 38 +++++++- public/stylesheets/sass/application.sass | 43 ++++++++- 6 files changed, 115 insertions(+), 86 deletions(-) diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml index 6ffdff25c..1a9c0d581 100644 --- a/app/views/dashboard/index.html.haml +++ b/app/views/dashboard/index.html.haml @@ -1,4 +1,3 @@ -= render "shared/publisher" %ul#stream - for post in @posts = render type_partial(post), :post => post diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 9bd3c7f9d..e864cbd22 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -36,6 +36,7 @@ = link_to "login", new_user_session_path + = render "shared/publisher" .container - if user_signed_in? %h1#user_name @@ -46,10 +47,6 @@ #content.span-24.last .span-5.append-1.last = link_to owner_picture, root_path - %ul#stream_filters.nav - %li= link_to "status messages", status_messages_path - %li= link_to "bookmarks", bookmarks_path - %li= link_to "blogs", blogs_path = render 'friends/sidebar' if user_signed_in? .span-18 diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml index c79da0082..72974f910 100644 --- a/app/views/shared/_publisher.haml +++ b/app/views/shared/_publisher.haml @@ -1,78 +1,37 @@ -:css - #publisher{ - padding: 10px; - padding-top: 15px; - padding-bottom: 35px; - background-color: #F2F8FC; - border-bottom: 2px #999 solid; - } - - #publisher_form { - margin-bottom: -15px; - } - - #new_bookmark { - display: none; - } - #new_blog { - display: none; - } - - ul#publisher_content_pickers { - margin: 0; - padding: 0; - text-shadow: 0 -2px 0 #fff; - } - - ul#publisher_content_pickers li { - display: inline; - padding: 5px 10px; - margin-right: 5px; - } - - .selected { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border: 1px solid #ccc; - border-top: 1px solid #333; - background-color: rgba( 255, 255, 255, 0.5); - -webkit-box-shadow: 0 2px 1px #fff; - -moz-box-shadow: 0 2px 1px #fff; - } - #publisher - %ul#publisher_content_pickers - %li{ :class => "status_message selected" }= link_to "status message", "#" - %li{ :class => "bookmark" }= link_to "bookmark", "#" - %li{ :class => "blog" }= link_to "blog", "#" + .container + %ul#publisher_content_pickers + %li{ :class => "status_message" }= link_to "status message", "#" + %li{ :class => "bookmark" }= link_to "bookmark", "#" + %li{ :class => "blog" }= link_to "blog", "#" - #publisher_form - = form_for StatusMessage.new, :remote => true do |f| - = f.error_messages - %p - %label{:for => "status_message_message"} Message - = f.text_area :message, :rows => 2 - %p - = f.submit "Post" + #publisher_form + = form_for StatusMessage.new, :remote => true do |f| + = f.error_messages + %p + %label{:for => "status_message_message"} Message + = f.text_area :message, :rows => 2 + %p + = f.submit "Post" - = form_for Bookmark.new, :remote => true do |f| - = f.error_messages - %p - %label{:for => "bookmark_title"} Title - = f.text_field :title - %p - %label{:for => "bookmark_link"} Link - = f.text_field :link - %p - = f.submit "Post" + = form_for Bookmark.new, :remote => true do |f| + = f.error_messages + %p + %label{:for => "bookmark_title"} Title + = f.text_field :title + %p + %label{:for => "bookmark_link"} Link + = f.text_field :link + %p + = f.submit "Post" - = form_for Blog.new, :remote => true do |f| - = f.error_messages - %p - %label{:for => "blog_title"} Title - = f.text_field :title - %p - %label{:for => "blog_body"} Body - = f.text_area :body - %p - = f.submit "Post" + = form_for Blog.new, :remote => true do |f| + = f.error_messages + %p + %label{:for => "blog_title"} Title + = f.text_field :title + %p + %label{:for => "blog_body"} Body + = f.text_area :body + %p + = f.submit "Post" diff --git a/public/javascripts/publisher.js b/public/javascripts/publisher.js index dd5094aee..ad7ff2f09 100644 --- a/public/javascripts/publisher.js +++ b/public/javascripts/publisher.js @@ -20,7 +20,7 @@ } }); - $("#publisher_content_pickers .blog").click(function(){ + $("#publisher_content_pickers .blog").click(function(){ if( $("#new_blog").css("display") == "none" ) { $("#publisher_content_pickers").children("li").removeClass("selected"); $("#publisher_form form").fadeOut(50); @@ -30,4 +30,9 @@ } }); + //$("#publisher").mouseout(function(){ + //$("#publisher_form form").fadeOut(200); + //$("#publisher_content_pickers li").removeClass("selected"); + //}); + }); diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 784d4582a..30c31225c 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -54,7 +54,7 @@ a { header { position: relative; margin: -2em; - margin-bottom: 2em; + margin-bottom: 0; height: 30px; color: white; background-color: #1a1a21; @@ -210,8 +210,8 @@ input[type='text'], textarea { height: auto; } input[type='submit'] { - position: absolute; - right: 0; } + display: block; + float: right; } form p { position: relative; @@ -226,3 +226,35 @@ label { ul.nav li > a { display: block; } + +#publisher { + padding: 0.5em 0; + background-color: #f2f8fc; + border-bottom: 1px #eaeaea solid; + margin: 0 -2em; + margin-bottom: 2em; } + +#new_blog, +#new_bookmark, +#new_status_message { + display: none; } + +ul#publisher_content_pickers { + display: inline; + margin: 0 -10px; + padding: 0; + text-shadow: 0 -2px 0 white; } + +ul#publisher_content_pickers li { + display: inline; + padding: 5px 10px; + margin-right: 5px; } + +.selected { + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border: 1px solid #cccccc; + border-top: 1px solid #333333; + background-color: rgba(255, 255, 255, 0.5); + -webkit-box-shadow: 0 2px 1px white; + -moz-box-shadow: 0 2px 1px white; } diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 520f4c869..a02e8fadc 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -57,7 +57,7 @@ a header :position relative :margin -2em - :bottom 2em + :bottom 0 :height 30px :color #fff :background @@ -252,8 +252,8 @@ input[type='text'], textarea input[type='submit'] - :position absolute - :right 0 + :display block + :float right form p :position relative @@ -268,3 +268,40 @@ label ul.nav li > a :display block + +#publisher + :padding 0.5em 0 + :background + :color #F2F8FC + :border + :bottom 1px #eaeaea solid + :margin 0 -2em + :bottom 2em + +#new_blog, +#new_bookmark, +#new_status_message + :display none + +ul#publisher_content_pickers + :display inline + :margin 0 -10px + :padding 0 + :text-shadow 0 -2px 0 #fff + +ul#publisher_content_pickers li + :display inline + :padding 5px 10px + :margin + :right 5px + +.selected + :-webkit-border-radius 5px + :-moz-border-radius 5px + :border 1px solid #ccc + :top 1px solid #333 + :background + :color rgba( 255, 255, 255, 0.5) + :-webkit-box-shadow 0 2px 1px #fff + :-moz-box-shadow 0 2px 1px #fff +