From 0391795f80dce247930819667f23f17a1a20bd8c Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Sat, 21 May 2011 14:52:59 -0700 Subject: [PATCH] better right pane sections --- app/views/aspects/index.html.haml | 38 +++++++++++++++++----- app/views/shared/_invitations.haml | 17 ++++------ config/locales/diaspora/en.yml | 6 ++-- public/images/icons/bookmark.png | Bin 0 -> 3152 bytes public/images/icons/cubbies.png | Bin 0 -> 3299 bytes public/images/icons/plus.png | Bin 0 -> 365 bytes public/stylesheets/sass/application.sass | 39 ++++++++++++++++++++--- 7 files changed, 74 insertions(+), 26 deletions(-) create mode 100644 public/images/icons/bookmark.png create mode 100644 public/images/icons/cubbies.png create mode 100644 public/images/icons/plus.png diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml index 95d531985..aea6d8048 100644 --- a/app/views/aspects/index.html.haml +++ b/app/views/aspects/index.html.haml @@ -12,7 +12,7 @@ :aspect_ids => @aspect_ids, :posts => @posts -.span-7.last +.span-7.leftBar.last #home_user_badge = owner_image_link %h3{:style => "position:relative;"} @@ -20,14 +20,36 @@ .description = link_to current_user.diaspora_handle, person_path(current_user.person) - %h4.section.invite_friends - != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.explanation_link_text'), bookmarklet)) - %h4.section.invite_friends= link_to "Generate an authentication token for Cubbi.es", token_path - - if @invites > 0 - .section.invite_friends - %h4= t('shared.invitations.invite_your_friends') - = render "shared/invitations", :invites => @invites + .section + .title + = image_tag('/images/icons/bookmark.png') + %h5 + Diaspora Bookmarklet + .content + != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.explanation_link_text'), bookmarklet)) + .section + .title + = image_tag('/images/icons/cubbies.png') + %h5 + Connect to Cubbi.es + .content + Cubbi.es is the first Diaspora application under development. + = link_to "Follow the instructions to get started", token_path + + - if @invites > 0 + .section + .title + + = image_tag('/images/icons/plus.png') + %h5 + .right + = t('shared.invitations.invitations_left', :count => @invites) + = t('shared.invitations.invite_your_friends') + .content + = render "shared/invitations", :invites => @invites + + %hr #aspect_listings.section = render 'aspects/aspect_listings', :aspects => @aspects diff --git a/app/views/shared/_invitations.haml b/app/views/shared/_invitations.haml index b68408489..b66d02d7f 100644 --- a/app/views/shared/_invitations.haml +++ b/app/views/shared/_invitations.haml @@ -3,18 +3,13 @@ -else -if invites > 0 - if SERVICES['facebook']['app_id'] !="" - %h4{:style => 'text-align:center;'} - - if defined? remote - = link_to t('.from_facebook'), friend_finder_path('facebook', :remote => remote), :rel => 'facebox' - -else - = link_to t('.from_facebook'), friend_finder_path('facebook'), :rel => 'facebox' + - if defined? remote + = link_to t('.from_facebook'), friend_finder_path('facebook', :remote => remote), :rel => 'facebox' + -else + = link_to t('.from_facebook'), friend_finder_path('facebook'), :rel => 'facebox' - = t('or') - = link_to t('.by_email'), new_user_invitation_path, :title => t('.invite_someone'), :rel => 'facebox' + = link_to t('.by_email'), new_user_invitation_path, :title => t('.invite_someone'), :rel => 'facebox' - else - %h4 - = link_to t('.by_email'), new_user_invitation_path, :title => t('.invite_someone'), :rel => 'facebox' - %h5{:style => 'text-align:center;'} - = t('.invitations_left', :count => invites) + = link_to t('.by_email'), new_user_invitation_path, :title => t('.invite_someone'), :rel => 'facebox' - else = t('.dont_have_now') diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml index 61cbd5a62..467ff7be2 100644 --- a/config/locales/diaspora/en.yml +++ b/config/locales/diaspora/en.yml @@ -160,8 +160,8 @@ en: bookmarklet: post_success: "Posted! Closing!" post_something: "Post something to Diaspora" - explanation: "%{link} from anywhere by bookmarking this link." - explanation_link_text: "Post to Diaspora" + explanation: "Post to Diaspora from anywhere by bookmarking %{link}." + explanation_link_text: "this link" comments: zero: "no comments" @@ -554,7 +554,7 @@ en: invitations: invites: "Invites" invite_someone: "Invite someone" - invitations_left: "(%{count} left)" + invitations_left: "%{count} left" dont_have_now: "You don't have any right now, but more invites are coming soon!" invites_closed: "Invites are currently closed on this Diaspora pod" invite_your_friends: "Invite your friends" diff --git a/public/images/icons/bookmark.png b/public/images/icons/bookmark.png new file mode 100644 index 0000000000000000000000000000000000000000..b0800f7ef600e8be0e90fe68c44819f5f6a5c5d4 GIT binary patch literal 3152 zcmd59P%W-INkGipfrAUfbtRXUdz` z-R=ehh>3qLN@C)Hi{T`3L*mgu!ipru1mne%7YPTwNel-$Ao$HpJIw4>CE=i(ZreBS z`+mRQ_r33Z@AZTExx>3AUYJNE61%FiS{*)jd;dGO!~08jAL@z3&SRvpz!qw+Du&Zd z>88`fsX?~~^NB>^;Gm})OPHZ1ZWFu6-MMm&L&Pj{$ERvStyjh!GP_3c(Y3jTv9@I7 zP3~Z6qA*YZpo^J~23^Z`l|hm7aTWOPJ?1&&o3N!Kr+S2Fp*D}o4#g;)l2TIA5Hd2F zl2h`Ol#$X0kR%8>UdZyYkQ8%@C@EqN4ga{(1S(LorPQ^VAsvj0T!*oq!t*ODE2$MZ z<snqak>&<1okV zIK7aR9bDBMo`+!VGzA@f`-rK?m z#Lu`#uB)V)gI>S*me5Uz?Efev;EO9O(XR0^{M3tXBs@Va2HHn z5GlqeL1dk@JIoE;#?n&XCh!b%tf+m~ai}}*xWrpCs3yvgMkqFzLw!|`Y|9jz1cLJ_ zq770k+|mu4f<@b8sOb!YF}y>aOM)mQ1rc7pRdk7zs?D%v0astQ4rAL})*b=oHq`@6 zh)tk^?mK8DmiXbY2;G_Esro0BR5?i-4$LM=Gt7=6KW>O|Gl}c_V zC(5#x6KAqoMHKTDbviF-Ss|NKXYy$^0`r9KRoi8{ZQv0*0rshUCZEg7Sv5P8^VoBe zSgxd}rE<0+XF!C%kx(I)BtMf5EjzH=3|6&Uj=!1WHbgaPnXuI&H&69;ANygTtv2(9 zV?q|ij4;gD7@IPqfKy(>MhDe#uivzYF&3}V)roc7q0oeu^h0AxVl((LIy4_sLcG^Q zP$5{sS>i(dt@@9G#&Q&&3`W7wB7PDO@;96UiSet~)t9juXdO+FG0X5+MF467@RbgR zjS<$d)DQ(l$|+M~r0_yxqodnxukLxTPkVLC1(6LK(Gm@Il2x)CPs9rS>eO;~y zswhp#(=%E;^ew_+$B3|L{sZCvTKKW$+$4PLR)36)7kKXo8dXk#-&$J*(@+?JP8O*& z)nf5V^Uf{Bf@Os+k~E>|^)1Gg;^mH76k|jTIQCr30%D5{QGFRB*a9Ep^c1-L=3CGN zBO0dlc3eZrgO0*Xbd#z`FU`4Trv@?;v`S>n)$#L=3D5=*Lu2fA%yijEK$&dTL+Od~g+ zDT?Z`1P5eRKBT`>tM3UDS>;4h09CP(HZeZGV|36~?PF)aUlhgJ*Etgo`d8-gIFQ-j%Tp z4V1!7_>b2w+=pBA^Q^MKjyf&2qEnm*F1*z)WTB3AbM@qRxBy1ytD4#v{M20hY`1W6 z=j7z%4Ox;>8<)6w2^R;^?P9@$< zd~@dD=?AxdeEaS%-@mtQ7rOQI_76`S`sArSR~9D+XMamAUT-D#oKD={_Hym&*X!%+ z56|8!?%Q{v^!{@f)l(nmPR=!(Yd_q)x&G0C?YGa}`0~=TJA}mNSC8DkJp08t?}tFO LGN)ahUVP^-fq~UJ literal 0 HcmV?d00001 diff --git a/public/images/icons/cubbies.png b/public/images/icons/cubbies.png new file mode 100644 index 0000000000000000000000000000000000000000..6111997c731bcc8bff747a5d26508f972e279d03 GIT binary patch literal 3299 zcmcgveQXnD7%zSR*#aS=arnhiAQ7a!k9J*qX$M`eK!MIty0FMUyWPEQUw6Ih?%rRaeaqoUFh2@xcb!(bQmlCLemyYOY)ktSn8tIoJ zvUg#7Q?$Z^fg&OzRVgZ}!B=8l%PtT9n~!NPWr>jfm^W?$Qa$M|Dxv9!3i>%e=aZOF zfNBl+1Fc+$3of8Ih6&S58y#SLY?x;`o()sgA8&gT71iY&pAi;U;b0Z>76>WvG(9vl zpAmKBHRU%e=sxjL%VcQUpA?dh8u%=R`O|efalbF{F`&89< zsh|5h)09G2L`@0ZX#T8APVt5|+9Zy*eYH@95Uy zR>aa3h#;I!|G9XvSZCfK$wBb98oP!7Ms~P_=nOKnvM!iTZ zOBh7+x@cPl-}p4-yDSpXr0U`r$Z{+n2=Hw19){%^#bEH$*3EQ(lJt?AH&`o%>J z6612?-Fj8LK_bz%>-GsQ#ReqIu=U7pEUVCfy|R}Iwt_%WR>AQQ7%SZjaS+Ki*V-0t zkPO#!ns5-d@u32OOm>Qc%d(Jl5uRmTiRTDQ1yRkL#YCHZ+RR(8?OC-!{yXAqkc$UH zOi<{s(=Z-^z8*+2ah7WhbSxI?UB7}jR16D6!~Flmuc`c;AYMkiVW~U9SC4pxfPWq-foPpREsO5KGn>@#Vc^G&`x|Z^uDq}yzN$9;z0ysw^-CvgNhTPZqYMHvWKkFa%4!pD@l2SL65`p)@k5!T_z*K~&u@EkyC!~g`t*=FL;LAOB#}>&w2~9a=Qy=AmEw!jvyYqfdR; zbNy$*^smveNncMbEjabm!hG}`Y0fMwCp%lWoq7Mxlkx5y+b4}K*c9BEd#?AJ>yGW3 z`N+W?ux_k_kd^WPlqR;*m>i)`Q0Ry>=fSW=za7LK-(R- literal 0 HcmV?d00001 diff --git a/public/images/icons/plus.png b/public/images/icons/plus.png new file mode 100644 index 0000000000000000000000000000000000000000..dfcbef3eb5def91045f0a55fb7f3db49e658e57b GIT binary patch literal 365 zcmV-z0h0cSP)65=7&0~k`sZk5rUeHI}B z<1E&nE!gZujMWv6zZT{i{~Z^W=OoSpf>@U^rZ< zs*7c#CV+DeaSjo|xyBgg2whZFa89hX2VAp5m&19CV4h`G9gWA!rZt+F z2~ew=*xY!9V}%gV5Ks|92#vJyg2A9Z>-QPY%l(00000 LNkvXXu0mjfl`5rE literal 0 HcmV?d00001 diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 0e1c70362..d2bbeba2e 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -1389,10 +1389,6 @@ ul#settings_nav a :color #69AEDD -.section - :margin - :bottom 24px - #aspect_listings .contacts :margin @@ -2825,3 +2821,38 @@ h1.tag :color #eee !important :font :weight bold + +.leftBar + .title + :position relative + :border + :bottom 1px solid #888 + :padding 2px 0 + :left 24px + + .right + :right 4px + :top 3px + :font-size smaller + :font-weight bold + :color #777 + + h5 + :font-size 13px + :font-weight 500 + :margin 0 + :color #444 + + img + :position absolute + :left 3px + :top 3px + + .section + .content + :padding 8px + :color #999 + :font-size 11px + :height 36px + :margin + :bottom 4px