bunch of small mobile ui fixes

This commit is contained in:
maxwell 2011-03-31 23:38:38 -07:00
parent 3add704d4a
commit 569fb66e9e
14 changed files with 29 additions and 55 deletions

View file

@ -18,9 +18,6 @@
= stylesheet_link_tag 'vendor/jquery.mobile-1.0a4.min', 'mobile' = stylesheet_link_tag 'vendor/jquery.mobile-1.0a4.min', 'mobile'
= csrf_meta_tag = csrf_meta_tag
:javascript
$(document).ready(Mobile.initialize);
= yield(:head) = yield(:head)
-if AppConfig[:google_a_site] -if AppConfig[:google_a_site]
@ -48,7 +45,7 @@
%body %body
#content{:data => {:role => 'page'}} #content{:data => {:role => 'page', :theme => 'c'}}
#header #header
- if current_user - if current_user
.left .left
@ -60,29 +57,10 @@
= yield = yield
#footer = render :partial =>'shared/footer'
- if current_user
logged in as
= link_to current_user.name, current_user.person
%br
%br
%b= t('.your_aspects')
%br
- for aspect in @all_aspects
= link_to aspect, aspects_path('a_ids[]' => aspect.id)
|
%br
%br
= link_to t('layouts.header.logout'), destroy_user_session_path
%br
%br
= link_to t('layouts.application.toggle'), toggle_mobile_path
-if current_user -if current_user
#menu{:data => {:role => 'page'}} #menu{:data => {:role => 'page', :theme => 'c'}}
#header #header
.right .right
= link_to(image_tag('icons/search_white.png'), people_path) = link_to(image_tag('icons/search_white.png'), people_path)
@ -110,19 +88,4 @@
= link_to aspect, aspects_path('a_ids[]' => aspect.id) = link_to aspect, aspects_path('a_ids[]' => aspect.id)
#footer = render :partial =>'shared/footer'
= link_to t('.logged_in_as', :name => current_user.name), current_user.person
%br
%br
%b= t('.your_aspects')
%br
- for aspect in @all_aspects
= link_to aspect, aspects_path('a_ids[]' => aspect.id)
|
%br
%br
= link_to t('layouts.header.logout'), destroy_user_session_path
%br
%br
= link_to t('layouts.application.toggle'), toggle_mobile_path

View file

@ -0,0 +1,12 @@
#footer{:data => {:role => 'footer'}}
.inset
%b= t('.your_aspects')
%div{:data => {:role => 'controlgroup', :type => 'horizontal'}}
- for aspect in @all_aspects
= link_to aspect, aspects_path('a_ids[]' => aspect.id)
|
.ui-bar
= link_to t('.logged_in_as', :name => current_user.name), current_user.person
= link_to t('layouts.header.logout'), destroy_user_session_path
= link_to t('layouts.application.toggle'), toggle_mobile_path

View file

@ -3,10 +3,6 @@
-# the COPYRIGHT file. -# the COPYRIGHT file.
.stream_element{:data=>{:guid=>post.id}} .stream_element{:data=>{:guid=>post.id}}
.right
%span.time
= time_ago_in_words(post.created_at)
.thumb_small= person_image_link(post.author, :size => :thumb_small) .thumb_small= person_image_link(post.author, :size => :thumb_small)
.content .content
@ -16,4 +12,6 @@
= render 'status_messages/status_message', :post => post, :photos => post.photos = render 'status_messages/status_message', :post => post, :photos => post.photos
.info .info
= link_to "#{t('comments', :count => post.comments.length)} →", status_message_path(post), :class => 'comment_link' %span.time
= t('ago', :time => time_ago_in_words(post.created_at))
= link_to "#{t('comments', :count => post.comments.length)} →", status_message_path(post), :class => 'comment_link right'

View file

@ -19,7 +19,7 @@
- if current_user.owns? @status_message - if current_user.owns? @status_message
= link_to t('delete'), @status_message, :confirm => t('are_you_sure'), :method => :delete = link_to t('delete'), @status_message, :confirm => t('are_you_sure'), :method => :delete
- else - else
= link_to t('hide'), post_visibility_path(:id => "42", :post_id => post.id), :confirm => t('are_you_sure'), :method => :put, :remote => true = link_to t('hide'), post_visibility_path(:id => "42", :post_id => @status_message.id), :confirm => t('are_you_sure'), :method => :put, :remote => true
.stream.show{:data=>{:guid=>@status_message.id}} .stream.show{:data=>{:guid=>@status_message.id}}
= render "comments/comments", :post => @status_message, :comments => @status_message.comments, :always_expanded => true = render "comments/comments", :post => @status_message, :comments => @status_message.comments, :always_expanded => true

View file

@ -263,8 +263,6 @@ en:
powered_by: "POWERED BY DIASPORA*" powered_by: "POWERED BY DIASPORA*"
whats_new: "what's new?" whats_new: "what's new?"
have_a_problem: "Have a problem? Find an answer here" have_a_problem: "Have a problem? Find an answer here"
your_aspects: "your aspects"
logged_in_as: "logged in as %{name}"
toggle: "toggle mobile site" toggle: "toggle mobile site"
public_feed: "Public Diaspora Feed for %{name}" public_feed: "Public Diaspora Feed for %{name}"
@ -573,7 +571,9 @@ en:
stream_element: stream_element:
like: "I like this" like: "I like this"
dislike: "I dislike this" dislike: "I dislike this"
footer:
logged_in_as: "logged in as %{name}"
your_aspects: "your aspects"
status_messages: status_messages:
new: new:
mentioning: "Mentioning: %{person}" mentioning: "Mentioning: %{person}"

View file

@ -7,13 +7,13 @@
$blue: #3F8FBA $blue: #3F8FBA
a:not([role='button']) a:not([role='button'])
:text :text
:decoration none :decoration none
:font :font
:weight normal !important :weight normal !important
:color $blue !important :-webkit-tap-highlight-color rgba(200, 200, 200, 1) !important
a.ui-link-inherit a.ui-link-inherit
:font :font
:weight bold !important :weight bold !important
@ -25,6 +25,7 @@ a.ui-link-inherit
.info_pane .info_pane
:text-align left :text-align left
#diaspora_description #diaspora_description
:background :background
:image url('../images/ball_small.png') :image url('../images/ball_small.png')
@ -106,8 +107,6 @@ a
:top 0.5em :top 0.5em
:font :font
:size smaller :size smaller
:text
:align right
.photo_attachments .photo_attachments
:margin :margin
@ -316,7 +315,9 @@ ul
#footer #footer
:background :background
:color #ccc :color #ccc
:padding 12px .inset
:padding 10px
.notification_day_header .notification_day_header
:padding 6px :padding 6px

Binary file not shown.

Before

Width:  |  Height:  |  Size: 364 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 460 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 453 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 519 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 907 B

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 908 B

After

Width:  |  Height:  |  Size: 2.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB