nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

moved publisher

Browse source
This commit is contained in:
danielvincent 2010-07-23 20:12:28 -07:00
parent b63b7fe482
commit d93c331615
6 changed files with 69 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/dashboards/index.html.haml
View file

@ -3,7 +3,9 @@
= link_to current_user.real_name, root_path = link_to current_user.real_name, root_path
%span.description %span.description
= my_latest_message = my_latest_message
%h1= title_for_page %h1= title_for_page
= render "shared/publisher"
%ul#stream %ul#stream
- for post in @posts - for post in @posts
= render type_partial(post), :post => post = render type_partial(post), :post => post

8
app/views/layouts/application.html.haml
View file

@ -39,9 +39,13 @@
= link_to "logout", destroy_user_session_path = link_to "logout", destroy_user_session_path
- else - else
= link_to "login", new_user_session_path = link_to "login", new_user_session_path
.container
= link_to "photos", albums_path
|
= link_to "ostatus", ostatus_path
%br
%br
= render "shared/publisher"
.container .container
.span-24.last .span-24.last
.span-3.append-1.last .span-3.append-1.last

71
app/views/shared/_publisher.haml
View file

@ -1,41 +1,38 @@
#publisher #publisher
.container %sp
%sp Post a new
Post a new %ul#publisher_content_pickers
%ul#publisher_content_pickers %li{ :class => "status_message selected" }= link_to "status message", "#"
%li{ :class => "status_message" }= link_to "status message", "#" %li{ :class => "bookmark" }= link_to "bookmark", "#"
%li{ :class => "bookmark" }= link_to "bookmark", "#" %li{ :class => "blog" }= link_to "blog", "#"
%li{ :class => "blog" }= link_to "blog", "#"
%li= link_to "photos", albums_path
%li= link_to "ostatus", ostatus_path
#publisher_form #publisher_form
= form_for StatusMessage.new, :remote => true do |f| = form_for StatusMessage.new, :remote => true do |f|
= f.error_messages = f.error_messages
%p %p
%label{:for => "status_message_message"} Message %label{:for => "status_message_message"} Message
= f.text_area :message, :rows => 2 = f.text_area :message, :rows => 2
%p %p
= f.submit "Post" = f.submit "Post"
= form_for Bookmark.new, :remote => true do |f| = form_for Bookmark.new, :remote => true do |f|
= f.error_messages = f.error_messages
%p %p
%label{:for => "bookmark_title"} Title %label{:for => "bookmark_title"} Title
= f.text_field :title = f.text_field :title
%p %p
%label{:for => "bookmark_link"} Link %label{:for => "bookmark_link"} Link
= f.text_field :link = f.text_field :link
%p %p
= f.submit "Post" = f.submit "Post"
= form_for Blog.new, :remote => true do |f| = form_for Blog.new, :remote => true do |f|
= f.error_messages = f.error_messages
%p %p
%label{:for => "blog_title"} Title %label{:for => "blog_title"} Title
= f.text_field :title = f.text_field :title
%p %p
%label{:for => "blog_body"} Body %label{:for => "blog_body"} Body
= f.text_area :body = f.text_area :body
%p %p
= f.submit "Post" = f.submit "Post"

3
public/javascripts/publisher.js
View file

@ -14,9 +14,6 @@
$(this).toggleClass("selected"); $(this).toggleClass("selected");
$(form_id).delay(50).fadeIn(200); $(form_id).delay(50).fadeIn(200);
} else {
$("#publisher_content_pickers").children("li").removeClass("selected");
$("#publisher_form form").fadeOut(200);
} }
} }
}); });

43
public/stylesheets/application.css
View file

@ -64,18 +64,14 @@ a {
header { header {
position: relative; position: relative;
margin: -2em; margin: -2em;
margin-bottom: 0; margin-bottom: 2em;
height: 50px;
color: #555555; color: #555555;
background-color: black;
background-color: -webkit-gradient(linear, 0% 0%, 0% 55%, from(#474747), to(black));
background-color: #414545;
background-color: #2b2726; background-color: #2b2726;
border-bottom: 1px solid #444444; border-bottom: 1px solid #444444;
padding-top: 20px; padding: 8px 0;
box-shadow: 0 2px 10px black; box-shadow: 0 2px 2px black;
-webkit-box-shadow: 0 2px 10px black; -webkit-box-shadow: 0 2px 2px black;
-moz-box-shadow: 0 2px 10px black; } -moz-box-shadow: 0 2px 2px black; }
header #diaspora_text { header #diaspora_text {
font-family: "BrandonGrotesqueLightRegular"; font-family: "BrandonGrotesqueLightRegular";
font-size: 24px; font-size: 24px;
@ -269,42 +265,31 @@ label {
left: 0.48em; } left: 0.48em; }
#publisher { #publisher {
padding: 0.5em 0;
background-color: #f2f8fc; background-color: #f2f8fc;
background-color: #333333; background-color: rgba(10, 81, 109, 0.05);
border-bottom: 1px #eaeaea solid; border-bottom: 2px #999999 solid;
margin: 0 -2em;
margin-bottom: 2em;
color: #999999; color: #999999;
box-shadow: 0 2px 20px #999999; padding: 20px 1em;
-webkit-box-shadow: 0 2px 20px #999999; padding-top: 10px; }
-moz-box-shadow: 0 2px 20px #999999; }
#publisher sp {
text-shadow: 0 2px 0 black; }
#publisher textarea, #publisher input {
box-shadow: 0 0px 3px black;
-webkit-box-shadow: 0 0px 3px black;
-moz-box-shadow: 0 0px 3px #999999; }
#new_blog, #new_blog,
#new_bookmark, #new_bookmark {
#new_status_message {
display: none; } display: none; }
ul#publisher_content_pickers { ul#publisher_content_pickers {
display: inline; display: inline;
margin: 0 -10px; margin: 0 -10px;
padding: 0; padding: 0;
margin-left: 10px; margin-left: 10px; }
text-shadow: 0 2px 0 black; }
ul#publisher_content_pickers li { ul#publisher_content_pickers li {
display: inline; display: inline;
padding: 5px 10px; padding: 5px 10px;
margin-right: 5px; } margin-right: 5px; }
#publisher.selected { #publisher .selected {
border-bottom: 3px solid #999999; } border-bottom: 3px solid #999999;
background-color: rgba(10, 81, 109, 0.1); }
#image_picker .small_photo { #image_picker .small_photo {
height: 100px; height: 100px;

43
public/stylesheets/sass/application.sass
View file

@ -68,21 +68,16 @@ a
header header
:position relative :position relative
:margin -2em :margin -2em
:bottom 0 :bottom 2em
:height 50px
:color #555 :color #555
:background :background
:color #000
:color -webkit-gradient(linear, 0% 0%, 0% 55%, from(#474747), to(#000000))
:color rgb(65,69,69)
:color #2B2726 :color #2B2726
:border :border
:bottom 1px solid #444 :bottom 1px solid #444
:padding :padding 8px 0
:top 20px :box-shadow 0 2px 2px #000
:box-shadow 0 2px 10px #000 :-webkit-box-shadow 0 2px 2px #000
:-webkit-box-shadow 0 2px 10px #000 :-moz-box-shadow 0 2px 2px #000
:-moz-box-shadow 0 2px 10px #000
#diaspora_text #diaspora_text
:font :font
@ -317,30 +312,17 @@ label
:left 0.48em :left 0.48em
#publisher #publisher
:padding 0.5em 0
:background :background
:color #F2F8FC :color #F2F8FC
:color #333 :color rgba(10,81,109,0.05)
:border :border
:bottom 1px #eaeaea solid :bottom 2px #999 solid
:margin 0 -2em
:bottom 2em
:color #999 :color #999
:box-shadow 0 2px 20px #999 :padding 20px 1em
:-webkit-box-shadow 0 2px 20px #999 :top 10px
:-moz-box-shadow 0 2px 20px #999
sp
:text-shadow 0 2px 0 #000
textarea, input
:box-shadow 0 0px 3px #000
:-webkit-box-shadow 0 0px 3px #000
:-moz-box-shadow 0 0px 3px #999
#new_blog, #new_blog,
#new_bookmark, #new_bookmark
#new_status_message
:display none :display none
ul#publisher_content_pickers ul#publisher_content_pickers
@ -349,7 +331,6 @@ ul#publisher_content_pickers
:padding 0 :padding 0
:margin :margin
:left 10px :left 10px
:text-shadow 0 2px 0 #000
ul#publisher_content_pickers li ul#publisher_content_pickers li
:display inline :display inline
@ -357,9 +338,11 @@ ul#publisher_content_pickers li
:margin :margin
:right 5px :right 5px
#publisher.selected #publisher .selected
:border :border
:bottom 3px solid #999 :bottom 3px solid #999
:background
:color rgba(10,81,109,0.1)
#image_picker #image_picker
.small_photo .small_photo