diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index b88b86ff1..67ff5313e 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -18,9 +18,6 @@ = stylesheet_link_tag 'vendor/jquery.mobile-1.0a4.min', 'mobile' = csrf_meta_tag - :javascript - $(document).ready(Mobile.initialize); - = yield(:head) -if AppConfig[:google_a_site] @@ -48,7 +45,7 @@ %body - #content{:data => {:role => 'page'}} + #content{:data => {:role => 'page', :theme => 'c'}} #header - if current_user .left @@ -60,29 +57,10 @@ = yield - #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 + = render :partial =>'shared/footer' -if current_user - #menu{:data => {:role => 'page'}} + #menu{:data => {:role => 'page', :theme => 'c'}} #header .right = link_to(image_tag('icons/search_white.png'), people_path) @@ -110,19 +88,4 @@ = link_to aspect, aspects_path('a_ids[]' => aspect.id) - #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 + = render :partial =>'shared/footer' diff --git a/app/views/shared/_footer.mobile.haml b/app/views/shared/_footer.mobile.haml new file mode 100644 index 000000000..d57da121e --- /dev/null +++ b/app/views/shared/_footer.mobile.haml @@ -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 diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml index f8a48abbd..8fbaec177 100644 --- a/app/views/shared/_stream_element.mobile.haml +++ b/app/views/shared/_stream_element.mobile.haml @@ -3,10 +3,6 @@ -# the COPYRIGHT file. .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) .content @@ -16,4 +12,6 @@ = render 'status_messages/status_message', :post => post, :photos => post.photos .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' diff --git a/app/views/status_messages/show.mobile.haml b/app/views/status_messages/show.mobile.haml index c770f8c72..24d7b0537 100644 --- a/app/views/status_messages/show.mobile.haml +++ b/app/views/status_messages/show.mobile.haml @@ -19,7 +19,7 @@ - if current_user.owns? @status_message = link_to t('delete'), @status_message, :confirm => t('are_you_sure'), :method => :delete - 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}} = render "comments/comments", :post => @status_message, :comments => @status_message.comments, :always_expanded => true diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 2d4159332..948507185 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -263,8 +263,6 @@ en: powered_by: "POWERED BY DIASPORA*" whats_new: "what's new?" 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" public_feed: "Public Diaspora Feed for %{name}" @@ -573,7 +571,9 @@ en: stream_element: like: "I like this" dislike: "I dislike this" - + footer: + logged_in_as: "logged in as %{name}" + your_aspects: "your aspects" status_messages: new: mentioning: "Mentioning: %{person}" diff --git a/public/stylesheets/sass/mobile.sass b/public/stylesheets/sass/mobile.sass index 06e94078a..43c2e857b 100644 --- a/public/stylesheets/sass/mobile.sass +++ b/public/stylesheets/sass/mobile.sass @@ -7,13 +7,13 @@ $blue: #3F8FBA + a:not([role='button']) :text :decoration none :font :weight normal !important - :color $blue !important - + :-webkit-tap-highlight-color rgba(200, 200, 200, 1) !important a.ui-link-inherit :font :weight bold !important @@ -25,6 +25,7 @@ a.ui-link-inherit .info_pane :text-align left + #diaspora_description :background :image url('../images/ball_small.png') @@ -106,8 +107,6 @@ a :top 0.5em :font :size smaller - :text - :align right .photo_attachments :margin @@ -316,7 +315,9 @@ ul #footer :background :color #ccc - :padding 12px + .inset + :padding 10px + .notification_day_header :padding 6px diff --git a/public/stylesheets/vendor/images/form-check-off.png b/public/stylesheets/vendor/images/form-check-off.png deleted file mode 100644 index 54e2fe0f8..000000000 Binary files a/public/stylesheets/vendor/images/form-check-off.png and /dev/null differ diff --git a/public/stylesheets/vendor/images/form-check-on.png b/public/stylesheets/vendor/images/form-check-on.png deleted file mode 100644 index e6daaaf8b..000000000 Binary files a/public/stylesheets/vendor/images/form-check-on.png and /dev/null differ diff --git a/public/stylesheets/vendor/images/form-radio-off.png b/public/stylesheets/vendor/images/form-radio-off.png deleted file mode 100644 index 32bd43392..000000000 Binary files a/public/stylesheets/vendor/images/form-radio-off.png and /dev/null differ diff --git a/public/stylesheets/vendor/images/form-radio-on.png b/public/stylesheets/vendor/images/form-radio-on.png deleted file mode 100644 index ddc404970..000000000 Binary files a/public/stylesheets/vendor/images/form-radio-on.png and /dev/null differ diff --git a/public/stylesheets/vendor/images/icons-18-black.png b/public/stylesheets/vendor/images/icons-18-black.png index 38f47267f..71268bdf7 100644 Binary files a/public/stylesheets/vendor/images/icons-18-black.png and b/public/stylesheets/vendor/images/icons-18-black.png differ diff --git a/public/stylesheets/vendor/images/icons-18-white.png b/public/stylesheets/vendor/images/icons-18-white.png index ceb283451..dadc6af58 100644 Binary files a/public/stylesheets/vendor/images/icons-18-white.png and b/public/stylesheets/vendor/images/icons-18-white.png differ diff --git a/public/stylesheets/vendor/images/icons-36-black.png b/public/stylesheets/vendor/images/icons-36-black.png index b079c51f4..8c35ae3fb 100644 Binary files a/public/stylesheets/vendor/images/icons-36-black.png and b/public/stylesheets/vendor/images/icons-36-black.png differ diff --git a/public/stylesheets/vendor/images/icons-36-white.png b/public/stylesheets/vendor/images/icons-36-white.png index 038cae40d..7e559b816 100644 Binary files a/public/stylesheets/vendor/images/icons-36-white.png and b/public/stylesheets/vendor/images/icons-36-white.png differ