From 6deb924c32151e6beea66cc51f36381f7124842b Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Tue, 20 Sep 2011 22:37:46 -0700 Subject: [PATCH] fixed header; compose message on top right --- app/controllers/posts_controller.rb | 4 ++ app/views/aspects/index.mobile.haml | 3 +- app/views/layouts/application.mobile.haml | 9 ++-- app/views/posts/show.mobile.haml | 4 +- app/views/shared/_stream_element.mobile.haml | 11 +++-- public/images/icons/compose_mobile.png | Bin 0 -> 1488 bytes public/images/icons/compose_mobile2.png | Bin 0 -> 2438 bytes public/stylesheets/sass/mobile.scss | 44 ++++++++++++++----- 8 files changed, 51 insertions(+), 24 deletions(-) create mode 100644 public/images/icons/compose_mobile.png create mode 100644 public/images/icons/compose_mobile2.png diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 905952665..997fe55f2 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -27,6 +27,10 @@ class PostsController < ApplicationController notification.save end + if is_mobile_device? + @comments = @post.comments + end + respond_to do |format| format.xml{ render :xml => @post.to_diaspora_xml } format.mobile{render 'posts/show.mobile.haml'} diff --git a/app/views/aspects/index.mobile.haml b/app/views/aspects/index.mobile.haml index 0d7ebde86..806b88d18 100644 --- a/app/views/aspects/index.mobile.haml +++ b/app/views/aspects/index.mobile.haml @@ -2,12 +2,11 @@ -# licensed under the Affero General Public License version 3 or later. See -# the COPYRIGHT file. -%h2 +%h2{:style => "padding:0 10px;display:none;"} - if @stream.for_all_aspects? = t('all_aspects') - else = @stream.aspect - = link_to 'Post', new_status_message_path, :id => 'publisher_button' #main_stream.stream = render 'shared/stream', :posts => @stream.posts diff --git a/app/views/layouts/application.mobile.haml b/app/views/layouts/application.mobile.haml index 26423f0e3..1cb5fd64d 100644 --- a/app/views/layouts/application.mobile.haml +++ b/app/views/layouts/application.mobile.haml @@ -13,7 +13,7 @@ %meta{"http-equiv"=>"Content-Type", :content=>"text/html; charset=utf-8"}/ / Viewport scale - %meta{:name =>'viewport', :content => "width=device-width, initial-scale=1"} + %meta{:name =>'viewport', :content => "width=device-width, minimum-scale=1 maximum-scale=1"} %meta{:name => "HandheldFriendly", :content => "True"} %meta{:name => "MobileOptimized", :content => "320"} / Force cleartype on WP7 @@ -25,8 +25,8 @@ %link{:rel => 'shortcut icon', :href => '/apple-touch-icon.png'} / iOS mobile web app indicator - /%meta{:name => "apple-mobile-web-app-capable", :content => "yes"} - /%link{:rel => "apple-touch-startup-image", :href => "/images/apple-splash.png"} + %meta{:name => "apple-mobile-web-app-capable", :content => "yes"} + %link{:rel => "apple-touch-startup-image", :href => "/images/apple-splash.png"} / Stylesheets = include_stylesheets :mobile @@ -45,7 +45,8 @@ %body %header - = link_to(image_tag('white@2x.png', :height => 22, :width => 136, :id => 'header_title'), aspects_path) + = link_to(image_tag('icons/compose_mobile2.png', :height => 28, :width => 28), new_status_message_path, :class => 'compose_icon') + = link_to(image_tag('white@2x.png', :height => 20, :width => 127, :id => 'header_title'), aspects_path) - if flash.present? %p diff --git a/app/views/posts/show.mobile.haml b/app/views/posts/show.mobile.haml index 198a6cd58..fcaaf3331 100644 --- a/app/views/posts/show.mobile.haml +++ b/app/views/posts/show.mobile.haml @@ -6,5 +6,5 @@ :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 +/.stream.show{:data=>{:guid=>@post.id}} +/ = render "comments/comments", :post => @post, :comments => @post.comments, :comments_expanded => true diff --git a/app/views/shared/_stream_element.mobile.haml b/app/views/shared/_stream_element.mobile.haml index 25ef1f082..8737a0d75 100644 --- a/app/views/shared/_stream_element.mobile.haml +++ b/app/views/shared/_stream_element.mobile.haml @@ -49,10 +49,13 @@ = link_to '', '#', :class => "image_link like_action active", 'data-post-id' => post.id, 'data-like-id' => current_user.like_for(post).id - else = link_to '', '#', :class => "image_link like_action inactive", 'data-post-id' => post.id - - .reshare_count.tab - = post.comments.size - = link_to '', post_path(post), :class => "image_link comment_action" + + /.reshare_count.tab + / = post.comments.size + / = link_to '', post_path(post), :class => "image_link comment_action" + + = render "comments/comments", :post => post, :comments => post.comments, :comments_expanded => true + - else .floater diff --git a/public/images/icons/compose_mobile.png b/public/images/icons/compose_mobile.png new file mode 100644 index 0000000000000000000000000000000000000000..b3284d33b47974f0ddf7fc19c6c361c96b00d501 GIT binary patch literal 1488 zcmZ`(eKgcr7{2pijoD@lC0}FxGIP{ONr_3!jCRaNMKvfLMHopXqpXkB@*|lsX_%=f zTR5|`&Zd%-M3!nI6l%}*p=l&D#PN|$wGn22+TC+@YxlhO-uHR#`@GM+=l*eXHu`f3 zcpE$bfWYUm1xRk0owzTM^+Iq(F_Nqke1j7L;&vt^h3}67KEk+&D2N{$9vvl!3Kyot zw?=sZV6>ml_6baWI;=e!tKk56)1?;hm5*(pEw8&&%PNMtO0}h9SiwS`XU2%hd4iHq zM0gT;8^l1>%bPw>o*R?Ub3)u>7D7oW&$o#WV0Qqbv-*q@{RMyqJV1!N78nfKa6_pJpPNs^3 z6{{pzB>W(h!@r~5#d5LJo>Kgm7Q>81!G>uvw_19~o#X=)VS+1_YZffX&ij9`+ zz9}~{fyzy|`>F6x?qt3kC~e}YUn7MkIr2W`*4zZ7kVxKy6lgt?Y%Iyoh&zu8?^;Xe zaM6;o?8rcbNa-A;rA!(*TWO>3;~+$)b3_P{p2n`ivPIiCuP=oyWCfCC(+&o2-1ToJ zfJCZ(;MT70O}KdL8LvBRg%l`%rO%%>)V3W}g)}aKobY#Q@IF;vu$x{i!nNW_7CE{( zipcDsP_!~4ehStGe#c5Q2jvgnG-jSQNqDVm*l(`B^Rv1{2QQ5Cgjx>9XnhM-yGoiMT)kmhrD<;1m$n6@ce*PR6pTcNE!KYXg?8076Au3UX7XsXk#*b17!?}Zv0LAbO1}FgA5Fj)dOQl^qzmv zA9jDL{-k-X!58znN#Tb>`oTi8l099`jXCY^Ub%0*8@fv<8toZC zOHVjDc107+>(9mHd&N3KZ?yL5x))tlO+l4E^Tc!=+?)52pX<)Nb#-QPLHxGU{{D&4VGXJl1vzr;FGi9fv%l``wN@t8&kpm{e&rR@&E?h Xt9vbUU!i(}e9?gK>(8!Ovm^5l5C&&8 literal 0 HcmV?d00001 diff --git a/public/images/icons/compose_mobile2.png b/public/images/icons/compose_mobile2.png new file mode 100644 index 0000000000000000000000000000000000000000..90c0db535afbf86e5ac5129939a8ee044b0e7dfd GIT binary patch literal 2438 zcmb_cYgAKL7ETFDf^sDk5fI_#fm9*MO@xpH&^+P7K*X4)RH+h@C`6MRlJJnh@<`B# z3y2Xxiw_2|J`ho~WmQY5!Z;|5XnnDy2xTk?gHolV(q(0CRIFV~=hvLI?m7GHyZ5)h zbIy0pwnRyco2#!Y27_^ng+)?y>~MTIEZTpuWzBJP@G*&#Oe>Lfrfh{ljp3`1R5ci@ zRjgM_)e6<7j7#cB3&DTDBC7%;BN{TD3_5=4dzSjNF_k z(o0+}YCGI?68JL2v>}T0id0fUA}B-*YA}ojQI!yj0kT4Aj8KRZ$_W9P5Cft!m~<$d z%7D0G;arFTzHTJ6nnAUWD-}h*u7%E`NNFaMo=c}^XJ^y0m(UQydOCx{;m{!_oynx4 z5me(Qok@{H)fvgt2qLvnX-LA-}9{~fB;zKJ%Pr0PHTz7yCe+oV_1rD`LRX;7jEw~p*6rRNF_YJ~|g$Pi@X z^e!f*AtuC_hUh`z$}k!OOi(D(bq>$VjD!Sktj=gs=#=VMQ4|Tqprxm)xNKpVm>gvG2z{JGF#>U2Z^X83@kGHk8X|-BcSJ#S)3M!Qv5)u*_898UpoSK@NC%M@7Y+{(dwY9_hK2$FfXCzG+2y1G8&C` zyWP#r&Bw=wOeQBKCDG~hj*gDX%F33OmZ_J`pWPCMa*8)eB`aTf{x3adf9bt04959n ztcWkmxii+cRocsQpP7OuD?8gu7n+Iqx*%tGyk+$6)aFz&=ykTX>D;PKPx3LPtv`A5QdC<$rZ|%#vv9Zdi4Cb#m?2%^eS`r)Oz@48dk`8}H-D$aG zaLcpy&K|o*kgC{MD!t$?m0Tc5<1TpEcle3jijPRHepa#fw}j#&P~fJ%WO!B64=Ek- zO%(U9hUs`!_NQR*TkKFXxckY8#}6bsiI-bTde8exKYHtT1%7k)#KDWgX!E|)H*cOk z$ZzaZ!EEoRJNKM@k(1k#3?qm8eI>Q*vWGzbgPB1Owg__1PyE!`*?%hIM_;6QK7M3I z_`;)v>H{qN+K#SM`~AJ{^fbXef+pacC0I0kGH$ovSD@Mw)PCn%c-pZ!1cqSm>${OdP3ixb=Q z`Z)h`Z~n%zJ*w+7CkGxC_AH2N$PBU3^FZ2GO)sT-;~MJWHrnLh4~=pBSeN#N$G`a8 z$O*AuiSoDY1rFAAs;Ra!ug$JS55b~=h&0d{@W2(Dodknm!BzGzL=j-Z?ZVC%4Dq&H<>-mm zR%A(rG*3Nl70!CJMm4&#UgLb#5=55&K=*@1OUE{Uv1q zY}-y>wIaV}m&m0TdE%JYkushy3f@C}7*HAzwR&qN$hVhtG2>%t?&Yf+8e9m+vG~VR z2gi4*2pQSfXDyd!EXw$7WH6@xr+)`%sid+t!rnHw$<>2rf9Ncs*dNKZ_slN(r%>#& z&Cn;m6Oa~c*k4Yirg|>!!1R3=o_nkjHpqQgPVV+QKA~gV2Z$JA;VF_Qjt%E%PT)Rp z0#Z-l@J>K&BhJSOus7fqIn6e-kZ#~+)eVRb94#5!N$#@Me$t%v@q