From 9b057bdf1669012d9976eab88deceae1f786bde9 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Tue, 27 Sep 2011 01:09:34 -0700 Subject: [PATCH] added placeholder; force autofill off on comment fields; touched up mobile reshare view --- app/views/comments/_new_comment.mobile.haml | 4 ++-- app/views/posts/show.mobile.haml | 3 --- app/views/reshares/_reshare.mobile.haml | 8 +++++++- public/stylesheets/sass/mobile.scss | 13 ++++++++----- 4 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/views/comments/_new_comment.mobile.haml b/app/views/comments/_new_comment.mobile.haml index a4e1592f1..e54bba87c 100644 --- a/app/views/comments/_new_comment.mobile.haml +++ b/app/views/comments/_new_comment.mobile.haml @@ -2,9 +2,9 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -= form_tag( post_comments_path(post_id), :id => "new_comment_on_#{post_id}", :class => 'new_comment') do += form_tag( post_comments_path(post_id), :id => "new_comment_on_#{post_id}", :class => 'new_comment', :autocomplete => "off") do = hidden_field_tag :post_id, post_id, :id => "post_id_on_#{post_id}" - = text_area_tag :text, nil, :rows => 2, :class => "comment_box",:id => "comment_text_on_#{post_id}" + = text_area_tag :text, nil, :rows => 2, :class => "comment_box",:id => "comment_text_on_#{post_id}", :placeholder => t('.comment') .actions = link_to "Cancel", post_path(post_id), :class => "cancel_new_comment btn" diff --git a/app/views/posts/show.mobile.haml b/app/views/posts/show.mobile.haml index 13e6d719d..0dda0b357 100644 --- a/app/views/posts/show.mobile.haml +++ b/app/views/posts/show.mobile.haml @@ -6,6 +6,3 @@ = render :partial => 'shared/stream_element', :locals => {:post => @post, :commenting_disabled => defined?(@commenting_disabled), :expanded_info => true} - -/.stream.show{:data=>{:guid=>@post.id}} -/ = render "comments/comments", :post => @post, :comments => @post.comments, :comments_expanded => true diff --git a/app/views/reshares/_reshare.mobile.haml b/app/views/reshares/_reshare.mobile.haml index abac28dd1..43577d7e3 100644 --- a/app/views/reshares/_reshare.mobile.haml +++ b/app/views/reshares/_reshare.mobile.haml @@ -2,12 +2,18 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. - .reshare - if post .content .from + = person_image_link(post.author, :size => :thumb_small) = person_link(post.author) + .info + %span.time{:integer => post.created_at.to_i} + = t('ago', :time => time_ago_in_words(post.created_at)) + %span.via + - if post.activity_streams? + = t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe - if post.activity_streams? = link_to image_tag(post.image_url, 'data-small-photo' => post.image_url, 'data-full-photo' => post.image_url, :class => 'stream-photo'), post.object_url, :class => "stream-photo-link" diff --git a/public/stylesheets/sass/mobile.scss b/public/stylesheets/sass/mobile.scss index 9e77eeb9d..8e63717a9 100644 --- a/public/stylesheets/sass/mobile.scss +++ b/public/stylesheets/sass/mobile.scss @@ -55,7 +55,7 @@ body { weight: bold !important; }; } margin-bottom: 2px; height: 45px; } - .content { + > .content { padding: 10px { bottom: 0; }; } padding: 10px 0; @@ -164,9 +164,12 @@ body { .reshare { .content { + border: { + left: 3px solid #ccc; + } padding: { - left: 15px; - top: 10px; }; + left: 5px; + top: 0px; }; } } @@ -485,14 +488,14 @@ input[type=submit] { .post_stats { position: absolute; font-size: larger; - right: 11px; + right: 10px; top: 38px; z-index: 2; span { color: #666; font-weight: bold; padding: 2px 7px; - margin: 5px 5px; + margin: 5px 6px; background: { color: #eee; }