From 1a2ba034abfacdd88573739fa47db98ccd94ac61 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 1 Jul 2011 17:23:58 -0700 Subject: [PATCH] added edit links in aspect_nav; removed ununsed icons; fixed facebox duplication on aspect/index --- app/controllers/people_controller.rb | 2 +- app/views/aspects/_aspect_listings.haml | 12 +++--- .../aspects/_selected_contacts.html.haml | 5 --- app/views/aspects/index.js.erb | 2 +- app/views/contacts/index.html.haml | 7 ++-- app/views/people/show.html.haml | 4 +- public/images/icons/doc_edit.png | Bin 3239 -> 0 bytes public/images/icons/happy_smiley.png | Bin 401 -> 0 bytes public/images/icons/mail.png | Bin 3246 -> 0 bytes public/images/icons/mail_grey.png | Bin 352 -> 0 bytes public/images/icons/monotone_chat_talk.png | Bin 518 -> 0 bytes public/images/icons/monotone_flag.png | Bin 451 -> 0 bytes public/images/icons/pencil.svg | 10 +++++ public/images/icons/photos.png | Bin 407 -> 0 bytes public/images/icons/sad_smiley.png | Bin 404 -> 0 bytes public/images/icons/spechbubble_2.png | Bin 3345 -> 0 bytes public/stylesheets/sass/application.sass | 35 ++++++++++++------ 17 files changed, 47 insertions(+), 30 deletions(-) delete mode 100644 public/images/icons/doc_edit.png delete mode 100644 public/images/icons/happy_smiley.png delete mode 100644 public/images/icons/mail.png delete mode 100644 public/images/icons/mail_grey.png delete mode 100644 public/images/icons/monotone_chat_talk.png delete mode 100644 public/images/icons/monotone_flag.png create mode 100755 public/images/icons/pencil.svg delete mode 100644 public/images/icons/photos.png delete mode 100644 public/images/icons/sad_smiley.png delete mode 100644 public/images/icons/spechbubble_2.png diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index f25d5a543..422bf1cbf 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -82,7 +82,7 @@ class PeopleController < ApplicationController @aspects_with_person = @contact.aspects @aspect_ids = @aspects_with_person.map(&:id) @contacts_of_contact_count = @contact.contacts.count - @contacts_of_contact = @contact.contacts.limit(36) + @contacts_of_contact = @contact.contacts.limit(8) else @contact ||= Contact.new diff --git a/app/views/aspects/_aspect_listings.haml b/app/views/aspects/_aspect_listings.haml index 7041487d0..63b5fec14 100644 --- a/app/views/aspects/_aspect_listings.haml +++ b/app/views/aspects/_aspect_listings.haml @@ -4,7 +4,7 @@ %ul#aspect_nav.left_nav %li.all_aspects{:class => ("active" if params["set"] != "all" && params["set"] != "only_sharing")} - %a{:href => controller_index_path, :class => ("sub_selected" if params["a_id"])} + %a.aspect_selector{:href => controller_index_path, :class => ("sub_selected" if params["a_id"])} .contact_count = my_contacts_count = t('contacts.index.my_contacts') @@ -12,24 +12,26 @@ %ul.sub_nav - for aspect in all_aspects %li{:class => ("active" if params["a_id"].to_i == aspect.id)} + .edit + = link_to image_tag("icons/pencil.svg", :height => 12), edit_aspect_path(aspect), :rel => "facebox" - %a{aspect_listing_link_opts(aspect)} - + %a.aspect_selector{aspect_listing_link_opts(aspect)} .contact_count = aspect.contacts.size = aspect + %li = link_to "+ Add an aspect", "#add_aspect_pane", :class => "new_aspect", :rel => "facebox" %li.all_contacts{:class => ("active" if params["set"] == "all" || params["set"] == "only_sharing")} - %a{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")} + %a.aspect_selector{:href => contacts_path(:set => "all"), :class => ("sub_selected" if params["set"] == "only_sharing")} .contact_count = all_contacts_count = t('contacts.index.all_contacts') %ul.sub_nav %li{:class => ("active" if params["set"] == "only_sharing")} - %a{:href => contacts_path(:set => "only_sharing")} + %a.aspect_selector{:href => contacts_path(:set => "only_sharing")} .contact_count = only_sharing_count = t('contacts.index.only_sharing_with_me') diff --git a/app/views/aspects/_selected_contacts.html.haml b/app/views/aspects/_selected_contacts.html.haml index 54eb6ac87..5cc025c92 100644 --- a/app/views/aspects/_selected_contacts.html.haml +++ b/app/views/aspects/_selected_contacts.html.haml @@ -7,8 +7,3 @@ - for contact in contacts = person_image_link contact.person - #edit_this_aspect - = link_to "View all contacts", contacts_path - - for aspect in @aspects - = link_to "Edit #{aspect.name}", edit_aspect_path(aspect), :rel => 'facebox' - %br diff --git a/app/views/aspects/index.js.erb b/app/views/aspects/index.js.erb index 0938a3236..3ff24df6e 100644 --- a/app/views/aspects/index.js.erb +++ b/app/views/aspects/index.js.erb @@ -1,3 +1,3 @@ $('#aspect_stream_container').html("<%= escape_javascript(render('aspects/aspect_stream', :aspect => @aspect, :aspect_ids => @aspect_ids, :posts => @posts)) %>"); $('#selected_aspect_contacts').html("<%= escape_javascript(render('aspects/selected_contacts', :count => @selected_contacts_count, :contacts => @selected_contacts)) %>"); -$('a[rel*=facebox]').facebox(); +$('#aspect_stream_container a[rel*=facebox]').facebox(); diff --git a/app/views/contacts/index.html.haml b/app/views/contacts/index.html.haml index 4e8a9cedd..f1789fdda 100644 --- a/app/views/contacts/index.html.haml +++ b/app/views/contacts/index.html.haml @@ -18,10 +18,9 @@ .span-18.last #people_stream.stream.contacts - #aspect_controls - = link_to "Edit #{@aspect_.name}", edit_aspect_path(@aspect_), :rel => "facebox" - - - if @aspect_ + - if @aspect_ + #aspect_controls + = link_to "Edit #{@aspect_.name}", edit_aspect_path(@aspect_), :rel => "facebox" = link_to "start a conversation", new_conversation_path(:aspect_id => @aspect_.id, :name => @aspect_.name), :class => "button conversation_button", :rel => "facebox" - if @contacts.size > 0 diff --git a/app/views/people/show.html.haml b/app/views/people/show.html.haml index 1f49f5fb0..ad573cea7 100644 --- a/app/views/people/show.html.haml +++ b/app/views/people/show.html.haml @@ -13,13 +13,13 @@ = render :partial => 'people/profile_sidebar', :locals => {:person => @person, :contact => @contact } - if user_signed_in? && @contact.persisted? && @contacts_of_contact.count > 0 - .span-8.last#contacts_of_contact + .span-5.last#contacts_of_contact .section.contact_pictures %h4 = t('contacts', :count => @contacts_of_contact_count) - for person in @contacts_of_contact = person_image_link person - - if @contacts_of_contact.count > 25 + - if @contacts_of_contact.count > 8 %p.see_all= link_to t('.see_all'), person_contacts_path(@person) .span-15.last diff --git a/public/images/icons/doc_edit.png b/public/images/icons/doc_edit.png deleted file mode 100644 index 17071ef8786ebb9c0bf8544dc25be2fcaa535e60..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3239 zcmd5w%S53Q>wLXGLK|8$&jQbnQS+;yRN&bT@<9VGk25ePG+)q zZg#U<6k1%R;saU{L0hF#t)dky{h?K=>w}8YO2r?7Aa4JtNMEQ>E5$Q2$#k+CwNMb3 zY?3?oobUV2x#ymHv#Ymf!-BTk+X8{Wf_#_M2cL`W|Lf<%`;kAQKL-LgY}N_`bf9~a zsF>xDteS&3R4Z3tJ`hN(uT^Aa7*jNei<*&S&K^C+AWcm&TiUz1?n)Myw5|z)`zLw| z%EYh|SDE#xwnR+?fHI~ss+D!a5^G7u!4=`V{g`EtV?u|MOxh+y1KqtSYZ8niAt59L z6|N(U+QXr6yU-y-)**r8Vk{SB!(5P$iM$~4F;xF!Qf(+f)FH7?>a5ejD9My4t%xi; zHZ~R-3x`ZnWcheJ&T;}P2tlw2TH^+lYeBbY49ufC zc%@`g(<+%2kHWC(S%dts-ZaaHIM(l&uTUidd9lOve1S`G#935j{T7b9lf5Po@b`S1 zcx!TH79$vUcmK0_x!eSA(cCD+ThCof0;@1y!E7J4%qmfEZWJ4Ir9Vtn@%$@QqC3H< z3X64I22%?}@=cT=vQI0PsO7n}q$Q4x>*?iKOjl{iBv!9!Y4(~yH4%y=jbMeE#8Gv{ zHcPOoL2!0O6hVrPhhznZV9{n6N;1V@4DV3q0>^Vfj)#|HCSj0?Sr{S_q<_I*-&tUT?2M59*IYU za5Nq5jM?llfzRe586g|Zg*!lmvyo7uDM?NyO_DWXw<$Dl44KYmYPQkRD#>beJjwJD zxmd+c7-+UluVSi@MZSZpXRL)ymJ-0pPGF^k`f#N>sB20~yj)q<^erZVCNwPH-J&FB zf^Q~u^A;t<+C2m%+!gH7EU3S6=aJi3`tgW6a)-L+Bmp63!-r+O`U6sxY*#+24# z8Lp}bK#dDNR>H6`ygC*NJSPeQ4}6H2Wdv>9cQ9N@i)H5}gjz{#@HrA^O0s1t_E};QpTx$RdJS#Va4wqk0yIZS?3o5ejKeIyNC9!cvwIQ>~0#c=&9mrcV$X-bJUSat3|J*E+~ zpJSqEvW|L8Bw?bB$`l-|RuUVejzpg%yD|1TN4U7zl8d;2N!j}Ui2XZtZiv2HAxL(g z!EF;Rx~zB8g@Jch#s)M{0yp7X7NvK?E&4W^8=(E>5FL{V4!9TId>OLPhh=qqimvv}$yIv~W^dHvLdhLTV`wu_xQ)Px#32;bRa{vGjVE_ORVF9Q=r)dBH00(qQO+^RW0~7%y6|n)6E&u=k0%A)?L;(MX zkIcUS009+AL_t&-83n;Viw|%Bz~Secfw+FIv-)#}OEDOfl47SMgDBpByTK`oL5b}a zKcXxKufV|O3}QXQMUmyoWVzwg4cGa29*GeXQ*UhBwBn|j7>O9MXiJhL-&~6kMocAn zWyz9{l5Njoh)Z^5JxSuUHQ6yA=KPX1lNd1)6C3i@9*#@SI_P?gn7Co$u4JBDQhb${ zvDZ8K5Xk~BTA|U_5Z$ zVMjf2JI+bwIpl}DkJtYBW7A*f%~+F9_KSOV<#ik|Yu3J4mtB{`i0^h}-5n>L@ko+s v42fCy?MRYj%VLa(k+@)LL$d0rNsQz_$9}Bwk<^R@00000NkvXXu0mjfx7(>a diff --git a/public/images/icons/mail.png b/public/images/icons/mail.png deleted file mode 100644 index 32c943a2f03ca5241be382a6ec60d7ec54e8ecd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3246 zcmd5)9#(KJA2+@dtK)qp8trmGw*iCo1IzT zyuIDKz%Y#vO!{Si6d_ntYDieoL4SCn6a^JQo?rw81_hC&QCLxZXJ&Vtz1vCvd!e;3^ZpLbsVQw{`{3~TujGLm~h zP|R{jR?Pwm)yox_4+Iju^@^;FAwm^UQ8SYC#dlBAl%^)>EnPV_S4pFi)<22S=E;G) zGC8KiRl2vQBT*Lspp1x2)yukJ3H2oH;0o}+{hFaE$ApX}Y0)O6MskBx+Qf*8g!m92 zRM_q?)fEnfyZCNCvYz5uHpZ|~Cd>x8n85J@7o!?KbWaDB!0M)zY=tNh$cr7O=L=klBhDf!nN_Ty%s4Vgr$0GprNxeo>*?iK5UZqQVr$T}G<(gUnlPax4I_n^*im)W zHjR<0L2!0O6hVrPMr8$sV9{n7N-{xU44+WvJj<~`mV?K!@-LB)H3-sm;Ht{{Mr7E_ zTG4>Hh-DWOViR&u@2X5>8`TFF&hwlQ4hvlPK9&<$)h)EGs2x zmSXAO(UhJu>x8n9tu~sd;! zi&f-=LCv)pR7@4J$aS-gjJ2^z6AU=%Nu-phAylarbWLfCmnqAdzQx4QgvR6zZAxM` z_%Lpmw<#gU?jcmdUBQ0Mg8G|qUb&5BGur8n+@Y>HNuVfa!wHZWr+O`U9I39>=9JcE z8Lp`aK#dDtD9#7EW7%RW0m*Cg{_Ul8dbxdTi)c*ycv)@mgl*Wao@pkH7%B%mk`xXVw2C2I9rk}Q?bty6Z<4K*VL2PBkHIw z8!E!oCe4Dga=aZ=)6HS>quMO)0qG-Y>heh1=fUaE+BkyiSGjB&79|pbwL;ao0}Yr) z(0-4wqRBcnU{Vso+PF->!D=V5N$N=SNwOQ`kaL6!!|3~cKsdGd0-3mdn z`wniKaM5MFn=TBzyD~DMfnvA`e|mb?6}UyOB$*Mi*&HP`8KZ!E;mwvI3qwd&Cw6{- z5@2*OD~b8~`7_U)TDph5Iiu{Is)&W%t8WiIda?7bMGBodv3a)esl4f><#nw=N^BaZ14Xmurcw=$>W#4?tN);F&j9$ WXUB!D^@%0+*NkjtKsuh<{^(!QssEDz diff --git a/public/images/icons/mail_grey.png b/public/images/icons/mail_grey.png deleted file mode 100644 index 07403d3da84f416165efbad6eca27a9cb1935b4d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 352 zcmV-m0iXVfP)l!4M3=5Dr2h7=j5zGK4?~gg_{R`Zc#d(-*sS+Neq^RUPSGRy*H} z_JIGEoKB}#5ov#8Cb?vHZ%Lj-WC2i~^v)z(5gD?o0>EHqCFhJMAhVfWa?UdVBr}7V z0l-{qeKE6fn>~2r?RLAa5SZBqz|0U4W3Ba|s^zm;RZFe)Kyup8^P0X_A&H16DWyq7 zT6ZrgrCvlzMBFWJH~0dHh>qj{03tG_l)6WYcMV8h0W2cY1L#OjE1-)Akh}os_TRn- zEbe|>Yj3l=RFZ8(3{BIV0krP`k_&*ITAd_bLFOs>@GIf1@`&>h6dp@lN*u0000(J29nwpxP zNs~5g*Z^eDojbR>y1KHml7X3-nVnrqPEJctub`lyrLC=^y1J~aEFn2LH$OizGBP4E zl8J?dg`J(9n_EdqDKjU>(%L#HEiElQJuNfS!_!kkOUugE*44wq#ob+1Q&U?{&(+-> z$ko)=HZ(C&R8>{i)D#vK6%-LsR90qSVglO8$il+J%E}BxY-~W2**H1bxVSigh?|>N zKtMoP7^qlSOiW5fMk@BGC(wJAB|(0{42(?7EUawo9Gu*e(&}1TmX=o5-rl}`0nxEp z`NgGe9Y8RB#>|;B*KIs-IxVp=Ra3!4pyAq#qKk+ckbS; zcH(|h=S(`q)upgt$@8@2w|b5)O^+vCGTVGLNl`6#6IZqrx8U@in-!IApFb5aG5Ad| W^4ouE`#+##89ZJ6T-G@yGywp&ak=jR diff --git a/public/images/icons/monotone_flag.png b/public/images/icons/monotone_flag.png deleted file mode 100644 index fbfeb559dad5423bcc813be68579237e6d2567a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 451 zcmV;!0X+VRP)ONKA^TJsip* zX$d57YAFz+#!_GJeZNHeF+}%l@11+k;hw8$e<>U$vyg#Ta-5t)zvlXulYnEh3#a#pH|=vXu&G+G1CZNPsV1Fd% z3Ar^b?xQ-?u{F{5sKg-%XHcb=NLUyE?%O=_QK&MD$YPMu + + + + + + diff --git a/public/images/icons/photos.png b/public/images/icons/photos.png deleted file mode 100644 index bc0d50f696a3dc9d1d424798fd5557b3cbb9893d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 407 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 diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass index 0cbf2f5cf..1bd28ec29 100644 --- a/public/stylesheets/sass/application.sass +++ b/public/stylesheets/sass/application.sass @@ -889,6 +889,7 @@ label form textarea + :resize none :width 455px :margin 0 @@ -2682,6 +2683,10 @@ h1.tag .see_all :text-align center + .avatar + :height 45px + :width 45px + .date :background :color #e6e6e6 @@ -2857,7 +2862,7 @@ ul.left_nav :position relative :width 100% - a + a.aspect_selector :display block :width 100% :padding 3px 7px @@ -2881,9 +2886,16 @@ ul.left_nav :weight 700 :color #666 + .contact_count, + .edit + :float right + + .edit + :margin-top 4px + :display none + .contact_count @include border-radius(4px) - :float right :margin-top 1px :color #999 :background @@ -2896,7 +2908,9 @@ ul.left_nav ul.sub_nav :padding 0 :margin 0 - a + li + :width 155px + a.aspect_selector :padding :left 15px :width 182px @@ -2909,11 +2923,15 @@ ul.left_nav :display none !important .left_nav - a + a.aspect_selector :width 150px ul.sub_nav - a + :width 140px + a.aspect_selector :width 140px + li:hover + .edit + :display inline-block .stream_container h3 @@ -3004,13 +3022,6 @@ ul.left_nav :margin :bottom -2px -#edit_this_aspect - :text-align center - :margin - :top 5px - :padding 3px - :border 1px dotted #ccc - .bottom_submit_section :display block :position relative