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

took out filler elements

Browse source
This commit is contained in:
danielvincent 2010-06-20 11:49:05 -07:00
parent df2b9d6ad4
commit aee5f7f04f
10 changed files with 159 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/dashboard_controller.rb
View file

@ -4,7 +4,8 @@ class DashboardController < ApplicationController
include ApplicationHelper
def index
@posts = StatusMessage.all
@bookmarks = Bookmark.all
@messages = StatusMessage.all
end

8
app/views/bookmarks/_pane.html.haml Normal file
View file

@ -0,0 +1,8 @@
%li.message
%span.from= link_to post.owner, "#"
%b shared a link
%br
= post.title
= link_to post.link, "#"
%div.time= "#{time_ago_in_words(post.updated_at)} ago"

19
app/views/bookmarks/index.html.haml
View file

@ -1,17 +1,8 @@
- title "Bookmarks"
%table
%tr
%th Title
%th Link
%th Owner
- for bookmark in @bookmarks
%tr
%td= bookmark.title
%td= link_to bookmark.link, bookmark.link
%td= bookmark.owner
%td= link_to 'Show', bookmark
%td= link_to 'Edit', edit_bookmark_path(bookmark)
%td= link_to 'Destroy', bookmark, :confirm => 'Are you sure?', :method => :delete
%div.big_text
%p.description= link_to "New Bookmark", new_bookmark_path
%p= link_to "New Bookmark", new_bookmark_path
%ul#stream
- for bookmark in @bookmarks
= render "pane", :post => bookmark

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

@ -1,41 +1,21 @@
%div.big_text
recent activity
%div.filters
= link_to "displaying all", "#"
%ul#stream
- for post in @messages
= render "status_messages/pane", :post => post
/%div.big_text#info_top
/welcome home, daniel.
/%p.description
/this is your diaspora dashboard, a place where you can catch a
/= link_to "glimpse", "#"
/of what all your friends are doing.
.span-15.append-2.last
%div.small_text
what's crackalackin', daniel?
%div#publish
- form_for 'StatusMessage' do |f|
= f.text_field :thought
%div.big_text
recent activity
%div.filters
= link_to "displaying all", "#"
%ul#stream
- for post in @posts
= render "status_messages/pane", :post => post
.span-7.last
%div.info_pane
%img{:src => "/images/mocks/bp.jpeg", :width => '100%', :class => "profile_image"}
%div.big_text
daniel grippi
%div.info_pane
%div.big_text
requests
%div.big_text
%div.big_number= link_to "30", "#"
new requests
/.span-7.last
/%div.info_pane
/%div.big_text
/%div.big_number= link_to "30", "#"
/new requests!
/%div.info_pane
/%div.big_text
/your profile
/%img{:src => "/images/mocks/bp.jpeg", :width => '20%', :class => "profile_image"}
/%div.info_pane
/%div.big_text
/your circle
/%p= link_to "see all friends", "#"

3
app/views/devise/sessions/new.html.haml
View file

@ -1,6 +1,4 @@
%div.centered
%div.big_text
sign in
= form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
= f.text_field :email
@ -10,6 +8,5 @@
- if devise_mapping.rememberable?
= f.check_box :remember_me
= f.label :remember_me
%br
= f.submit "Sign in"
= render :partial => "devise/shared/links"

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

@ -15,28 +15,28 @@
= yield(:head)
%body
#header
.container
#huge_star *
%a#diaspora_text{:href => root_path}
%img{:src => '/images/diaspora_white.png'}
%header
%a#diaspora_text{:href => root_path}
%img{:src => '/images/diaspora_white.png'}
#session_action
- if user_signed_in?
= link_to User.first.email, destroy_user_session_path
- else
= link_to "login", new_user_session_path
#session_action
- if user_signed_in?
= link_to User.first.email, destroy_user_session_path
- else
= link_to "login", new_user_session_path
#header_below
.container
%nav
%ul.nav
%li= link_to "home", root_path
%li= link_to "users", users_path
%li= link_to "status messages", status_messages_path
%li= link_to "bookmarks", bookmarks_path
%li= link_to "blogs", blogs_path
%li= link_to "friends", friends_path
.container
- if show_title?
%h2= yield(:title)
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
= yield
- if show_title?
%div.big_text= yield(:title)
- flash.each do |name, msg|
= content_tag :div, msg, :id => "flash_#{name}"
= yield

14
app/views/status_messages/_pane.html.haml
View file

@ -1,9 +1,7 @@
%li
%img{:src => "/images/mocks/user_pic.jpeg", :class => "avatar"}
%sp.message
%sp.from= link_to post.owner, "#"
/%sp.from Daniel Grippi
= post.message
%br
%sp.time= "#{time_ago_in_words(post.updated_at)} ago"
%li.message
%span.from
= link_to post.owner, "#"
= post.message
%div.time
= "#{time_ago_in_words(post.updated_at)} ago"

36
app/views/status_messages/index.html.haml
View file

@ -1,34 +1,10 @@
- title "Home"
- title "status messages"
%h3 Your latest message
%h2= my_latest_message
%div.big_text
%p.description= my_latest_message
%p.description= link_to "New Status Message", new_status_message_path
%br
%br
%br
%h3 Messages
%ul
%ul#stream
- for status_message in @status_messages
%li
= "#{status_message.message} by #{status_message.owner} #{time_ago_in_words(status_message.created_at)} ago"
= link_to 'Show', status_message
|
=link_to 'Destroy', status_message, :confirm => 'Are you sure?', :method => :delete
= render "pane", :post => status_message
%h2 Friends
%table
%tr
%th username
%th url
- for friend in @friends
%tr
%td= friend.username
%td= friend.url
%td= link_to 'Show', friend
%td= link_to 'Destroy', friend, :confirm => 'Are you sure?', :method => :delete
%p= link_to "New Status Message", new_status_message_path

80
public/stylesheets/application.css
View file

@ -1,5 +1,7 @@
body {
font-family: "helvetica", "arial", "sans-serif"; }
font-family: "helvetica", "arial", "sans-serif";
padding: 2em;
margin: 0; }
a {
color: #cc1e14;
@ -50,31 +52,29 @@ h4 {
.error_messages ul {
margin: 0; }
#header {
header {
margin-top: -2em;
margin-right: -2em;
margin-left: -2em;
height: 30px;
color: white;
font-size: 110%;
background-color: #1a1a21;
border-bottom: 2px solid white;
padding-top: 5px; }
#header #huge_star {
display: none;
position: absolute;
font-family: "helvetica neue", "helvetica", "arial", "sans-serif";
font-size: 60px;
top: -15px; }
#header #diaspora_text {
header #diaspora_text {
position: absolute;
border: none;
top: 8px; }
#header #session_action {
float: right;
font-size: 110%;
margin-top: 1px; }
#header #session_action a {
top: 8px;
left: 1em; }
header #session_action {
position: absolute;
right: 1em;
font-size: 120%;
margin-top: 2px; }
header #session_action a {
color: #cccccc;
border: none; }
#header #session_action a:hover {
header #session_action a:hover {
color: white; }
ul.nav {
@ -103,11 +103,13 @@ ul.nav {
color: #cccccc; }
#header_below {
padding: 1em;
position: relative;
background-color: #e6eff7;
text-align: right;
height: 70px;
margin-bottom: 40px; }
margin-left: -2em;
margin-right: -2em;
margin-bottom: 40px;
height: 20px; }
#left_pane {
background-color: #e6eff7;
@ -121,26 +123,32 @@ ul#stream {
ul#stream > li {
list-style: none;
padding: 1em;
border-bottom: 1px solid #f1f1f1; }
border-bottom: 1px solid #f1f1f1;
border-radius: 2px; }
ul#stream > li img.avatar {
width: 45px;
background: white; }
ul#stream > li:hover {
background-color: #f1f1f1;
border-bottom: 1px solid #cccccc; }
ul#stream > li:hover .message {
color: black; }
ul#stream > li:hover .time {
color: #666666; }
sp.message {
position: absolute;
float: left;
li.message {
margin-left: 10px;
margin-top: -2px;
line-height: 17px;
font-size: 120%;
font-family: "Lucida Grande";
color: #666666;
text-shadow: none;
width: 480px; }
sp.message sp.from {
color: #999999;
text-shadow: none; }
li.message span.from {
color: black;
font-weight: bold; }
sp.message sp.time {
font-weight: bold;
margin-right: 0.2em; }
li.message div.time {
color: #bababa;
font-size: 70%; }
@ -167,7 +175,7 @@ div.small_text {
font-size: 18px;
font-weight: bold; }
#publish input {
#publish input#thought {
font-size: 30px;
padding: 7px;
border-radius: 5px;
@ -181,10 +189,13 @@ div.small_text {
border: 2px solid #eaeaea; }
form {
font-size: 130%; }
font-size: 430%;
margin: 1em;
margin-left: 0em; }
form input {
font-size: 150%;
padding: 0.2em; }
padding: 0.2em;
max-width: 100%; }
.centered {
text-align: center; }
@ -193,4 +204,5 @@ form {
padding: 1em;
background-color: #1a1a21;
color: #f5fafd;
margin-bottom: 1em; }
margin-bottom: 1em;
border-radius: 2px; }

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

@ -1,6 +1,9 @@
body
:font
:family 'helvetica', 'arial', 'sans-serif'
:padding 2em
:margin 0
a
:color #CC1E14
@ -55,11 +58,14 @@ h4
ul
:margin 0
#header
header
:margin
:top -2em
:right -2em
:left -2em
:height 30px
:color #fff
:font
:size 110%
:background
:color #1A1A21
:border
@ -67,27 +73,19 @@ h4
:padding
:top 5px
#huge_star
:display none
:position absolute
:font
:family 'helvetica neue', 'helvetica', 'arial', 'sans-serif'
:size 60px
//:background
//:color #ff3378
:top -15px
#diaspora_text
:position absolute
:border none
:top 8px
:left 1em
#session_action
:float right
:font-size 110%
:margin-top 1px
:position absolute
:right 1em
:font
:size 120%
:margin
:top 2px
a
:color #ccc
:border none
@ -129,13 +127,15 @@ ul.nav
#header_below
:padding 1em
:position relative
:background
:color #e6eff7
:text-align right
:height 70px
:margin
:left -2em
:right -2em
:bottom 40px
:height 20px
#left_pane
@ -152,18 +152,30 @@ ul#stream
> li
:list-style none
:padding 1em
//:-webkit-box-shadow 0 4px 5px -5px #999
:border
:bottom 1px solid #f1f1f1
img.avatar
:width 45px
background: #fff
:border-radius 2px
> li:hover
:background
:color #f1f1f1
:border
:bottom 1px solid #ccc
> li:hover .message
:color #000
> li:hover .time
:color #666
sp.message
:position absolute
:float left
li.message
:margin
:left 10px
:top -2px
@ -171,16 +183,17 @@ sp.message
:font
:size 120%
:family 'Lucida Grande'
:color #666
:color #999
:text-shadow none
:width 480px
sp.from
span.from
:color #000
:font
:weight bold
:margin
:right 0.2em
sp.time
div.time
:color #bababa
:font-size 70%
@ -216,10 +229,8 @@ div.small_text
:size 18px
:weight bold
#publish
input
input#thought
:font
:size 30px
:padding 7px
@ -239,12 +250,16 @@ div.small_text
form
:font
:size 130%
:size 430%
:margin 1em
:margin-left 0em
input
:font
:size 150%
:padding 0.2em
:max-width 100%
.centered
:text-align center
@ -256,3 +271,4 @@ form
:color #f5fafd
:margin
:bottom 1em
:border-radius 2px