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

adjusting more page structure. drafting about there.

Browse source
This commit is contained in:
danielvincent 2010-11-18 18:54:42 -08:00
parent 7a259d6d53
commit 2b54d9a0c5
13 changed files with 148 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,7 +5,7 @@
.span-24.last
%h2{:style=>"position:relative;"}
= current_user.real_name
Home
.right{:style=>"font-size:12px;"}
= link_to "View Profile", current_user.person

2
app/views/aspects/show.html.haml
View file

@ -2,7 +2,7 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
.span-4.append-1.last
.span-8.append-1.last
= render 'shared/aspect_contacts', :contacts => @aspect_contacts, :aspect => @aspect
.span-15.last

6
app/views/comments/_new_comment.html.haml
View file

@ -6,8 +6,6 @@
%p
= label_tag "comment_text_on_#{post.id}", t('.comment')
= comment.text_area :text, :rows => 1, :id => "comment_text_on_#{post.id}", :class => "comment_box"
= comment.hidden_field :post_id, :id => "post_id_on_#{post.id}", :value => post.id
%p{:style => "text-align:right;"}
= comment.submit t('.comment'), :id => "comment_submit_#{post.id}", :class => "comment_submit button", :disable_with => t('.commenting')
= comment.submit t('.comment'), :id => "comment_submit_#{post.id}", :class => "comment_submit button", :disable_with => t('.commenting')

1
app/views/people/_profile_sidebar.html.haml
View file

@ -12,7 +12,6 @@
- if @posts.first
%li
%i= t(".last_seen",:how_long_ago => how_long_ago(@posts.first))
- if is_contact
%li
%ul#aspects_for_person

6
app/views/people/show.html.haml
View file

@ -3,11 +3,12 @@
-# the COPYRIGHT file.
.span-4.append-1.last
.span-24.last
= render 'shared/author_info', :person => @person, :profile => true
.span-8.append-1.last
= render :partial => 'people/profile_sidebar', :locals => {:person => @person, :is_contact => @is_contact}
.span-15.last
= render 'shared/author_info', :person => @person
- if @contact || current_user.person == @person
- if @posts.count > 0
@ -36,3 +37,4 @@
%h3
.description
= t('.already_requested', :name => @person.real_name)

2
app/views/photos/_index.html.haml
View file

@ -11,7 +11,7 @@
});
});
.span-15.last
.span-20.last
#thumbnails
- for photo in photos
.image_thumb

17
app/views/photos/show.html.haml
View file

@ -8,10 +8,6 @@
= render 'shared/author_info', :person => @photo.person, :post => @photo
%ul#breadcrumb
%li= link_to "#{@photo.person.profile.first_name}'s #{t('_photos')}", person_photos_path(@photo.person)
%li= @photo.caption
/ we need to do next photo here
/- if @photo.album
/= link_to "<< #{t('.prev')}", url_to_prev(@photo, @album), :rel => 'prefetch', :id => "prev_photo"
@ -34,11 +30,14 @@
= image_tag @photo.url(:scaled_full)
.caption
-if @ownership
-if @photo.caption and @photo.caption != ""
= link_to t('.edit_photo'),'javascript:void(0)', :id => "edit-desc", :class => "edit-desc"
.description
= @photo.caption
= @photo.caption
%br
%br
%br
-if @ownership
= link_to t('.edit_photo'),'javascript:void(0)', :id => "edit-desc", :class => "edit-desc"
-if @ownership
%div{:class => 'clear'}

60
app/views/shared/_aspect_contacts.haml
View file

@ -2,14 +2,61 @@
-# licensed under the Affero General Public License version 3 or later. See
-# the COPYRIGHT file.
- if @request_count > 0
#left_pane{:class => "everyone"}
%h4
= "#{@request_count} new requests!"
%br
%br
#left_pane{:class => ("everyone" if aspect == :all)}
%h2{:style=>"position:relative;"}
= aspect == :all ? t('.everyone') : aspect
- if aspect == :all
= t('.everyone')
- else
= aspect
.contact_pictures
- for contact in contacts
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
= person_image_link(contact.person)
-unless (aspect == :all)
= link_to (image_tag('add_contact_button.png', :title => t('.manage', :aspect => @aspect))), "#manage_aspect_contacts_pane", :class => 'manage_aspect_contacts_button'
@ -51,10 +98,11 @@
%br
%h3
Invites and requests
- if aspect == :all
%h3
Invites and requests
No new requests
%br
No new requests
%br
= render "shared/invitations", :invites => @invites
= render "shared/invitations", :invites => @invites

21
app/views/shared/_author_info.html.haml
View file

@ -1,8 +1,8 @@
#author_info
= person_image_link(person)
= person_image_link(person) unless defined?(profile)
.from
%h2
= link_to person.real_name, person_path(person)
= person.real_name
- if defined?(post)
.aspect
➔
@ -12,15 +12,8 @@
- else
- for aspect in current_user.aspects_with_post( post.id )
%li= link_to aspect.name, aspect
#person_nav_links
= link_to t('.view_profile'), person_path(person)
= link_to t('_photos'), person_photos_path(person)
= link_to t('.status_messages'), person_status_messages_path(person)
- if defined?(@post_type)
- case @post_type
- when :all
= "#{t('.viewing')}: #{t('.all')}"
- when :photos
= "#{t('.viewing')}: #{t('_photos')}"
- when :status_messages
= "#{t('.viewing')}: #{t('.status_messages')}"
.right{:style=>"margin-right:315px;top:10px;"}
#person_nav_links
= link_to t('.view_profile'), person_path(person)
= link_to t('_photos'), person_photos_path(person)
= link_to t('.status_messages'), person_status_messages_path(person)

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

@ -54,7 +54,7 @@
= render 'shared/public_explain'
/#publisher_photo_upload
/= t('or')
/= render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id)
#publisher_photo_upload
= t('or')
= render 'photos/new_photo', :aspect_id => (aspect == :all ? aspect : aspect.id)

3
app/views/shared/_stream_element.html.haml
View file

@ -10,8 +10,7 @@
.from
= link_to post.person.real_name, post.person
.aspect
/➔
%i sent to
➔
%ul
- if post.public?
%li= t('the_world')

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

@ -6,16 +6,16 @@
= render 'shared/author_info', :person => @status_message.person, :post => @status_message
.span-14.append-1.last
%h1.show_text
= markdownify(@status_message.message)
= how_long_ago(@status_message)
- if current_user.owns? @status_message
#show_text
%p
= link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete
= markdownify(@status_message.message)
.time
= how_long_ago(@status_message)
- if current_user.owns? @status_message
= link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete
.span-9.last
%h4{:style=>"margin-bottom:5px;"} Comments
%div{:class => 'stream show', :id => 'status_message_stream'}
%li.message{:data=>{:guid=>@status_message.id}}
= render "comments/comments", :post => @status_message

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

@ -190,9 +190,8 @@ header
:margin 0
:padding 0
> li
:min-height 50px
:list-style none
:padding 12px 0
:padding 12px
:border
:bottom 1px solid #eee
@ -264,32 +263,33 @@ header
#author_info
:position relative
:padding
:left 65px
:height 70px
:margin
:bottom 12px
img
:position absolute
:top 7px
:left 0
:border-radius none
:display inline-block
:-webkit-box-shadow 0 1px 2px #666
:-moz-box-shadow 0 1px 2px #666
.from
:display inline-block
:padding 12px
:top 0
h2
:display inline
:margin
:bottom -2px
a
:font
:weight normal
.aspect
ul > li a
:font
:weight 200
#person_nav_links
a
:padding
:margin
:right 2em
.from
:font
:size 14px
.avatar
:-webkit-border-radius 5px
@ -567,8 +567,8 @@ ul.comments
.profile_photo
img
:height 150px
:width 150px
:height 300px
:width 300px
#profile
ul
@ -633,24 +633,34 @@ li.message .from .right
:margin-right 1em
#show_photo
:background
:color #fff
:padding 10px
:bottom 20px
:-webkit-box-shadow 0 2px 4px #333
:-moz-box-shadow 0 2px 4px #333
:-webkit-border-radius 3px
:-moz-border-radius 3px
:border-radius 3px
img
:max-width 100%
:border 10px solid #fff
:bottom 80px solid #fff
:-webkit-box-shadow 0 2px 4px #333
:-moz-box-shadow 0 2px 4px #333
:-webkit-border-radius 3px
:-moz-border-radius 3px
:border-radius 3px
:margin
:bottom 10px
:border 1px solid #eee
:bottom 1px solid #ddd
.caption
:margin
:top 10px
:bottom 25px
:min-height 20px
:padding 0 10px
:font
:size larger
:size 16px
:font
:family 'marker felt', 'comic sans ms', 'comic sans', sans-serif
:color #555
#debug_info
:margin-top 20px
@ -707,10 +717,11 @@ label
#publisher
:color #999
:position relative
:min-height 65px
:width 100%
:min-height 53px
:margin
:bottom 10px
:padding 12px
:top 0
:border
:bottom 2px #777 solid
@ -728,7 +739,6 @@ label
:position relative
:margin
:left 65px
:bottom 10px
:top 0
textarea
@ -737,7 +747,7 @@ label
input[type='text'],
textarea
:width 514px
:width 490px
:margin 0
.options_and_submit
@ -788,41 +798,6 @@ label
:border 1px solid #fff
/* cycle it! */
.album
:margin
:right 3px
:position relative
:height 200px
:width 200px
:display inline-block
img
:width 200px
:height 200px
.name
:position absolute
:z-index 6
:padding 1em
:background rgba(0,0,0,0.8)
:bottom 20px
:font
:size 18px
:text-shadow 0 2px 0 #000
.time
:font
:size 12px
a
:font
:weight normal
div.image_cycle
img
:display none
.field_with_submit
input[type='text']
:width 82%
@ -1180,7 +1155,6 @@ ul#settings_nav
:padding 0
#left_pane
ul
:margin 0
:padding 0
@ -1201,6 +1175,7 @@ ul#settings_nav
:color rgb(250,250,250)
:border 1px solid #ddd
:padding 11px
:-webkit-border-radius 4px
h2,h3
:border
@ -1282,10 +1257,16 @@ header
:font
:size small
.show_text
img
:height 27px
:width 27px
#show_text
:font
:size 24px
:family "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif
.time
:color #888
:font
:size 18px
:weight bold
.edit_pane
@ -1298,9 +1279,9 @@ header
:color rgba(51,51,51,0.9)
:padding 10px
:position absolute
:right 10px
:right 1px
:margin
:top 10px
:top 1px
a
:font