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

DG IZ; getting there.

Browse source
This commit is contained in:
danielvincent 2010-06-29 14:34:33 -07:00
parent 260805af64
commit 5193a20458
9 changed files with 104 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/views/blogs/_blog.html.haml
View file

@ -2,11 +2,12 @@
%span.from
= link_to_person post.person
%b wrote a new blog post
- if mine?(post)
.destroy_link
= link_to 'Destroy', status_message_path(post), :confirm => 'Are you sure?', :method => :delete
%br
%b= post.title
%br
= raw post.body
%div.time= link_to "#{time_ago_in_words(post.updated_at)} ago", blog_path(post)
- if mine?(post)
.destroy_link
= link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete

6
app/views/bookmarks/_bookmark.html.haml
View file

@ -2,9 +2,6 @@
%span.from
= link_to_person post.person
%b shared a link
- if mine?(post)
.destroy_link
= link_to 'Destroy', status_message_path(post), :confirm => 'Are you sure?', :method => :delete
%br
= post.title
@ -12,3 +9,6 @@
= post.link
%div.time= link_to "#{time_ago_in_words(post.updated_at)} ago", bookmark_path(post)
- if mine?(post)
.destroy_link
= link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete

1
app/views/dashboard/index.html.haml
View file

@ -1,5 +1,4 @@
= render "shared/publisher"
%h1 your network stream
%ul#stream
- for post in @posts
= render type_partial(post), :post => post

4
app/views/friends/_sidebar.html.haml
View file

@ -1,8 +1,8 @@
%h1 your friends
%h3 your friends
%ul#stream
- for friend in @friends
= link_to friend.real_name, friend_path(friend)
%br
%br
%hr
= link_to "add a new friend", new_friend_path
= link_to "add a new friend", new_friend_path

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

@ -40,7 +40,15 @@
ws.send(location.pathname);
debug("connected...");
};
$("#stream li").hover(function() {
$(this).children(".destroy_link").fadeIn(0);
}, function() {
$(this).children(".destroy_link").fadeOut(0);
});
});
%body
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
@ -58,17 +66,15 @@
- else
= link_to "login", new_user_session_path
#header_below
.container
- if user_signed_in?
%h1#user_name
= link_to User.first.real_name, root_url
%span.description
= my_latest_message
.container
- if user_signed_in?
%h1#user_name
= link_to User.first.real_name, root_url
%span.description
= my_latest_message
#content.span-24.last
.span-4.append-1.last
.span-5.append-1.last
%img{:src => "/images/user_picture.jpg", :id => "user_picture"}
%ul#stream_filters
%a{ :href => root_path, :title => "Your network stream."}
@ -81,8 +87,7 @@
%li blogs
%a{ :href => friends_path, :title => "Your list of connections with other seeds."}
%li friends
.span-14.append-1.last
= render 'friends/sidebar' if user_signed_in?
.span-18
= yield
= render "posts/debug"
.span-3.last
= render 'friends/sidebar' if user_signed_in?

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

@ -1,9 +1,14 @@
:css
#publisher{
height: 300px;
background-color: #eaeaea;
border: 1px solid #666;
padding: 1em;
padding: 10px;
padding-top: 20px;
padding-bottom: 5px;
background-color: rgba( 242, 248, 252, 0.7 );
border-bottom: 2px #999 solid;
}
#publisher_form {
margin-bottom: -15px;
}
#new_bookmark {
@ -20,7 +25,15 @@
ul#publisher_content_pickers li {
display: inline;
margin-right: 2em;
padding: 0.6em;
border-radius: 5px;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
border: 1px solid #666;
background-color: rgba( 255,255,255, 1 );
}
:javascript
@ -63,7 +76,7 @@
= f.error_messages
%p
= f.text_field :message, :value => "Message"
= f.submit :class => 'button'
= f.submit "Post"
= form_for Bookmark.new, :remote => true do |f|
@ -71,11 +84,11 @@
%p
= f.text_field :title, :value => "Title"
= f.text_field :link, :value => "URL"
= f.submit
= f.submit "Post"
= form_for Blog.new, :remote => true do |f|
= f.error_messages
%p
= f.text_field :title, :value => "Title"
= f.text_area :body
= f.submit
= f.submit "Post"

8
app/views/status_messages/_status_message.html.haml
View file

@ -3,10 +3,10 @@
= link_to_person post.person
= post.message
- if mine?(post)
.destroy_link
= link_to 'Destroy', status_message_path(post), :confirm => 'Are you sure?', :method => :delete
%div.time
= link_to(how_long_ago(post), status_message_path(post))
= render "comments/comments", :post => post
- if mine?(post)
.destroy_link
= link_to 'Delete', status_message_path(post), :confirm => 'Are you sure?', :method => :delete

48
public/stylesheets/application.css
View file

@ -3,10 +3,9 @@ body {
margin: 0; }
a {
color: #cc1e14;
text-decoration: none; }
a:hover {
color: #cc1e14; }
color: #316191;
text-decoration: none;
font-weight: bold; }
#flash_notice,
#flash_error,
@ -54,11 +53,11 @@ a {
header {
position: relative;
margin: -2em;
margin-bottom: 0;
margin-bottom: 2em;
height: 30px;
color: white;
background-color: #1a1a21;
border-bottom: 2px solid white;
border-bottom: 2px solid #7e96a6;
padding-top: 5px; }
header #diaspora_text {
position: absolute;
@ -108,44 +107,39 @@ ul#stream_filters {
padding-top: 0.8em;
padding-bottom: 0.4em; }
#content {
position: absolute;
top: 94px; }
#main {
width: 100%; }
ul#stream {
margin: 0;
padding: 0;
color: #666666; }
color: #666666;
font-size: 110%; }
ul#stream > li {
list-style: none;
padding: 1em;
padding: 1em 0;
border-bottom: 1px solid #f1f1f1;
margin-bottom: 5px; }
li.message {
position: relative;
line-height: 140%;
font-family: "Lucida Grande", "sans-serif";
color: #999999; }
li.message span.from {
color: black;
color: #333333;
font-weight: bold;
margin-right: 0.2em; }
li.message div.time {
color: #bababa;
font-size: 70%; }
#user_name {
font-size: 15px;
line-height: 100%; }
h1 {
position: relative;
font-size: 18px;
font-size: 21px;
font-weight: bold;
line-height: 36px; }
line-height: 36px;
text-shadow: 0 1px 1px #cccccc; }
h1 p.description, h1 span.description {
font-weight: 200;
font-family: "helvetica neue", "lucida grande", "sans-serif";
@ -155,7 +149,8 @@ h1 {
h3 {
position: relative;
font-size: 18px;
font-weight: bold; }
font-weight: bold;
text-shadow: 0 1px 1px #cccccc; }
#publish input#thought {
font-size: 30px;
@ -173,7 +168,7 @@ form {
max-width: 100%; }
#user_name {
text-shadow: 0 1px 0 white; }
margin-bottom: 1em; }
#user_name a {
color: black; }
#user_name a:hover {
@ -201,6 +196,9 @@ ul.comment_set {
color: #333333;
font-weight: bold; }
.new_comment {
display: none; }
img#profile_picture {
width: 100%; }
@ -211,7 +209,13 @@ img#user_picture {
padding: 3px; }
.destroy_link {
float: right; }
position: absolute;
right: 0;
bottom: 15px;
display: none; }
.destroy_link a {
color: #999999;
font-weight: normal; }
#debug_info {
margin-top: 20px; }

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

@ -2,11 +2,10 @@ body
:padding 2em
:margin 0
a
:color #CC1E14
:color #316191
:text
:decoration none
&:hover
:color #CC1E14
:font-weight bold
#flash_notice,
#flash_error,
@ -56,13 +55,13 @@ a
header
:position relative
:margin -2em
:bottom 0
:bottom 2em
:height 30px
:color #fff
:background
:color #1A1A21
:border
:bottom 2px solid #fff
:bottom 2px solid #7E96A6
:padding
:top 5px
@ -118,9 +117,6 @@ ul#stream_filters
:top 0.8em
:bottom 0.4em
#content
:position absolute
:top 94px
#main
:width 100%
@ -129,23 +125,25 @@ ul#stream
:margin 0
:padding 0
:color #666
:font
:size 110%
> li
:list-style none
:padding 1em
:padding 1em 0
:border
:bottom 1px solid #f1f1f1
:margin-bottom 5px
li.message
:position relative
:line-height 140%
:font
:family 'Lucida Grande', 'sans-serif'
:color #999
span.from
:color #000
:color #333
:font
:weight bold
:margin
@ -154,18 +152,11 @@ li.message
div.time
:color #bababa
:font-size 70%
.mine
//:background-color rgba(202, 237, 204, 0.5)
#user_name
:font
:size 15px
:line-height 100%
h1
:position relative
:font
:size 18px
:size 21px
:weight bold
:line-height 36px
@ -175,12 +166,16 @@ h1
:family 'helvetica neue', 'lucida grande', 'sans-serif'
:color #999
:padding 0.1em
:text
:shadow 0 1px 1px #ccc
h3
:position relative
:font
:size 18px
:weight bold
:text
:shadow 0 1px 1px #ccc
#publish
input#thought
@ -203,12 +198,12 @@ form
:max-width 100%
#user_name
:margin
:bottom 1em
a
:color #000
&:hover
:color #CC1E14
:text
:shadow 0 1px 0 #fff
#comment_text
:padding 3px
@ -237,6 +232,10 @@ ul.comment_set
:font
:weight bold
.new_comment
:display none
img#profile_picture
:width 100%
@ -248,7 +247,14 @@ img#user_picture
:padding 3px
.destroy_link
:float right
:position absolute
:right 0
:bottom 15px
:display none
a
:color #999
:font
:weight normal
#debug_info
:margin-top 20px