From 05683de16b23ae6a81375b8a428d45a6331f8628 Mon Sep 17 00:00:00 2001 From: danielgrippi <danielgrippi@gmail.com> Date: Fri, 27 Apr 2012 17:41:47 -0700 Subject: [PATCH] removed some old assets; added a link to profile edit next to quick stats on a profile page --- app/assets/images/404.png | Bin 15062 -> 0 bytes app/assets/images/buttons/follow_hover.png | Bin 3796 -> 0 bytes app/assets/javascripts/app/pages/composer.js | 1 - app/assets/javascripts/app/pages/profile.js | 7 +++++- app/assets/stylesheets/new-templates.css.scss | 1 + .../stylesheets/new_styles/_canvas.scss | 22 ------------------ .../stylesheets/new_styles/_profile.scss | 17 +++++++++++++- .../stylesheets/new_styles/_variables.scss | 22 ++++++++++++++++++ app/assets/templates/profile-info.jst.hbs | 19 ++++++++++----- app/assets/templates/profile.jst.hbs | 4 ---- app/controllers/profiles_controller.rb | 1 + 11 files changed, 59 insertions(+), 35 deletions(-) delete mode 100644 app/assets/images/404.png delete mode 100644 app/assets/images/buttons/follow_hover.png create mode 100644 app/assets/stylesheets/new_styles/_variables.scss diff --git a/app/assets/images/404.png b/app/assets/images/404.png deleted file mode 100644 index 2172c13b13d5a9348910e79ebf73b88123d8fda9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15062 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 diff --git a/app/assets/images/buttons/follow_hover.png b/app/assets/images/buttons/follow_hover.png deleted file mode 100644 index 5e1d3ed92fffec0c78e2b7b5fd3142c01e4ff03b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3796 zcmbVPdpK0v`yaW7+$tqyOpcJb?3pnb<2qw9is>+Ns~8L>&BYkklqkeOl0;;bTO}&F zROD8aX_8A$VUU!LB)8-e`HniB-|vs}e1FgL+t0K1T5Iq3^LgL(uFt#IvlI6_>`_>+ zz8(YuDUfUlj-r0QsOic`iSBf-<6@$2E7!)A>%{WohEX{*kd-gXn+7H^sQxrZ8r3%< zsEvjLfyDjj6j!dR{XVP@ivgpq*}%dXY!Mm+!dZl~sXl=;F4&vqPiLAzCTklYV7jjv z#Kq7aVb8|X0_e7p9GX+41H~sY(8t6VVqp%(g=0ko3>udT4rd%?24lm`AU}AqqVd{e zI0XE|gd1oE`5Ba}{eCc>#i4->VF;)X0)qf!02qKm8yOiHfRP9Q0Y@O=01^rqVNpmd z0s;Q}f{46veEqPF1mfSmL^Cr;0GG?g!r@_IVX!b1jK%SX112UWYaB=<RAd1Sj$m@B z;ZSDq&R+}!TCfj?&gRltOz;{b)teQ<HG_yE{ka4N+ur^kVrKB)i4vs@9!_P$0T=?# zV63g{hjlR5k@i1f{Ht{^C4x<ZJJNz#Asipke)#SD1s3J*zdKqp6h(t2bLgT?p&li$ zd_ovBCYMAogNWY1eCfVejFBM%WsSs$8UkYs0M<4r6B_`H#}n`<Yb!&eUmX92HMX)Q z05$}oF~$lB05&45wH4mR$_RrpAzA}~@h>ci8O)_JeQ3Y@(nWs%#@hT>EEdn9QMoJ* zg~dAhO9A@>SX@?c0E-RAI~juQsXlb(+I($$ey)~4<IqECzC;d-0sfI+Ed5{nV~GFP zx_@GQ|35i{i-Li#iQ|8X<<}#T0@sHBNMAJhr+8>gQN?gXrLhVt@CSk9BuE4+N_gL= zOQZk_dB>Ad(=w7UMcGiFNlh*|lSI@4C+QX>Cq+vPM>|SL3tCR8SxwDYM9zIYiAc^5 zSJ(J`KS5-+_igH>d#ORBtDQFo%;xkyek<;peJ~Mp`$Jm9{<`^(&MO~l;B)#x3scnd z#|$wToe8LNcYOB+h0jN_ckW5`ePorG7Lyr7`zkd{e2wX<$zYM5ZzT$zy~cR;=QCF7 zr*o^51@hE<+F?Gbytx{vPMKp+8lS#HbXfwoUR1NHk58BN&nvj<6g$PV731#e^kIr> zYQiG-?tR8DFE2M~^Q{nmy`X?X5#^*&+50@5oqHY??Y(&T?&Rw2vVm&YmZOWA_KQsj zX`Pgsve7SN-O)!FjFk}Ky`bW&SDRg>9{9!FZ@pkwBzW^CfBXY~<uf6GH}>i^J2&tC zLhF_k#o;5lOONJxF=P$lMY!js(b3WBvF?&p#=wJ+Xyssl2BbOfX5?_kx{9Ez!Meqe z-U?cAMMam`8+E|@^y1Q7=~fetuS8v4olst0KC7YvIiKfHk^shAAS}Pmet7XY8~8Fm zH+LUsboL~Z&w89SuNTkpm*^cBnDAOX8g)`xdVZib?C$4*+E=a~9>-XJ-gGk?ym{<5 zzid|3`>&cGp6B@Mkn=R?l5*C<zd8%Hzx|S;ZpepfH@h7SBV7!WNznC*F&GM0Q$?qm zrxl;|KO;U3__P{tx#_Y#YNjbp)2YP4u!cFX)KY8WZR3VS4BN?FyHQZ!^SzSZojez# z9FvZ9ylS6?XoB*sA(?SB9i(!7u$l&4YEnr`tP%gnE2Caae6+Jrtf;v}>EM<C!}<Bp zr^W!{OU$Os?j8^gAvbG~q6Apm`B)yPmn2TzGy#jv*j}#Pr;R?eL@Pgt(AS21Ar&=> zz^A<>K_kR($-m9KOlp4b7y@m)dhO1cx7)tsWjJjviIz%Nrf-6-Om<;m>oO`&)?Uhz z0<N$OB+cXAL^f%g@!q&V==eJ~l959YXKCfuy}LJ3d{qpzt>d)S%*7!^dNV=jrI<Dp zyNFiz$Cg%GahmmykSDP!hlkU3iXYh8ZrdUp8qy5f0k$QW+ZC%3v5VWwSwr<UE8xet z&y8uGr*3zkJ3-lLxfT+cDm?Eu@$VU~ZiG3Qs-=35vqU$<F-#efVDLEYsv~G|yO*qq zBxo?EB;cuQ)cNI2VQ)HI?4pulwjI7xl&t}EJnxiA53rKCvo%sw5Z(_qPMntad%7L^ zcAFr7`q0#c3SGrz&o@poOoLl9$J5-}6!l0Kq;5BUo1aWDeyzI8VN1?Y;&=U==fu(Q zzdEkyDm6-!x3{<3nl6M+zqRox1v`0qvM@|xK>6W^N7{2uMh0Kq@?6y%Q9WSdetr>G z5EQh~;UdHAl&84uq}#@FT9J}*5r=GtGI7k@F4;nbf~laa43&dQ7jKQ^q&aA-;O!o2 zwj@jj7+xwxlFylGnm6jjx5vt7NRd*Cw7{p(6y@9bg+(vL%RKI}ued#o4B04YmEkW? z+5#>!+$gz8ti?bUEO>H4LQ_^NS%5gRIf1NokMG>@%<?);bxPU2vb1zJ#PZz!sv?;^ z$1?om9M7}pM~)z?2Sa6$p)E<9{ANd=<1y<_AH4^hl<iD#^Q;YpULrrQr#;&&y(&`u zsHh_S=06X#uV?GM$TLGpZ_r>bXqbiyaN$#ppZaTF?8`>d&TNx0Le6x$RmwiQ(=5Z^ zdOaj-m!45N{?FKJrs@g3C&9DtJo@_kFOx^yZ+pe;Rbvj;jg2z;t0#s+>CL)lvX3uJ zHRW1F56(dk*S(HfUg#9oAMY<qRMNHL;UZKdw}t+mFJAndXE9V4ImaK?r@qUK>=HzA zTLA#Gez$s)?Mn>>fuwr;F=bt;Tx<wm0~g-$X{dqskXQnM!{75a8SR)Id=OIFd)NOg z%6Z+{uFZ$8>~tYKj9RS7Y4Cfle%I&8hPz>thm9KU-|tQFsPIh;)<Tq5RrN$I&a?n~ zhGN{DoJRhX4fGyX{FLVK{+!lj8+yKAkB0x%Wl6#5Cfn@_9p#Dpc$477!uP8FFY+c@ z+t8VC&mBbuDF1f!*&Sv`MNM;!Sn(k|PukorlDhFRK%5<_KRzx{iAQeerfmqci2g2= zm5uXCUcQ8OfZ3TEUR52J8<P+2m?Tn7_5+klB?6p*5ZJ1`{?TTryRW*sdi<wnZM)vq zG$&c^OH%dL4H_<3<d2{=pNs8~X9NZYPl|-hm4AGCI$LmRu@Bc#9NSfm=t(R%|FT3^ z^*|@oQ(M&<+4q#PqKlGwQmX4R*eXm--LMBOAoN$BOT0e)u)G}Rot35i_MPxa>h|$b zvlGk4%^zC+Q0t7E$_9MmyU~Jhk@)>4`l^_h$6wv5o$l%BQ8w?J>@Hq6KiTP)Aq6pG z*xETEoU-p!DiEq<^>|ji<ueCkv{NS^Wwhs+jmtbi2S`XX706Pvio?8ax>xaq_k*A0 znufJYN{n803#c2N6@*Eu3nG>mreP<QZLOo;ZO+(c%?oXq6$wo$K9PCvnH;;wnEF;v z4`K){#F1quL=1=G#C)z{-QC?anj}=;2MGLkoCZ?E=wS>-S?_J?sbdZ7;n@4f=F4*$ z0$-KOXrkp6{BYOhPbB{(Kln*MVIiRV0R4OhSo3nwXC3OUw68AxUrlqEH%(3~FR*sI zlyl`0>g{77$*Bgd#uJnPo`Z^SJu=b;)!L*ns`pSf8g^aaNRVnTA@l6w&pK8Z-%GBI zUOn-u{j%wN|L2@)vuCy0AVj6zCNay(mBI&UXNqlGy}?^P_v*2qo~3d)UmIP{wI95& zcWIZ_lMP)(k4uz<!e#U=*_~TgTsvV170cZOkdG_6=EzAe#_Cgps^9G>6ffm2cRW4u zAkno}^yRc>kIXds3KkV>bQQ+(zk}i|WeODA?%ZB_q#oK;NIK_s?Z&xYz$M+8a$Zp( zxE(?L;Gs9IC&e^Z5G;+zpL<y(%m2_EMY;r5rEtoS>&N(7d((yI>c1Oy>>|=X;2kal z0b=ssSkqPoNiCx2yii&r9+)xmHrg`ptC*HjW*|~d$*W1}+GerDsb~Y0mkqQ-oR9pn zFGD+V7xE{98ISIoFFd`nDr0U}meeFVnBd0K`rD6q_3>~Y4=7p1@-J>2eE)@%fxqy< zt&`$GMv}E;tPzA&v#edv4xVvVp*dOycQ{7z=g|}n?itC>B1!4@1~MKFz=WiYj=iz( zGLGu+DI~kcMocAVRDFY3KY|9Q{ho3i4Bm6AQrz{%!RF{z>ejit(|QtW8lP|*)Q0z8 z-`wT>Cf{Ow`c852=sM?hDr#LIznCfMvnu{J_oiMI9@(=}8Lw<>ntX<$WEb#0zepij zF)Zv$Y1PJsjj?+p0{#&DI)ZI!q-+qkINDb^_F@+~FE@0gHO1L?COuDIVo`tKLh0CF z5+1fMZz8v^q-R9%8`v?Gkg^lIMs=PFdWJQBYq3z}v3KIxoqeLiWCR88=cq`9hD-T5 zUXlH#2(M-hefMy3>elS*>-)36&G|cPnQb~c-i3YEi1zbvahacAT8d2iWb{4C%M&KP ziIDYrsH0=brQhLO_l-?hJ|a1F!SDEiu5og4Xr$z+h=p{k)J3dRIv<U}6w_Yi)n3jE z!b&5B4%hr}a49p3$m8R3-C08X=&(ulRGom0-Nx`vk^@j9<d3W4$q6S;tgbHI8RxB& Z2MtW5Yh>(ueq!xElVsySD7W^C{SQmwm#P2& diff --git a/app/assets/javascripts/app/pages/composer.js b/app/assets/javascripts/app/pages/composer.js index 097d54a072..d8b47789e3 100644 --- a/app/assets/javascripts/app/pages/composer.js +++ b/app/assets/javascripts/app/pages/composer.js @@ -16,7 +16,6 @@ app.pages.Composer = app.views.Base.extend({ "input.service:checked" : "services" }, - initialize : function(){ app.frame = this.model = new app.models.StatusMessage(); this.postForm = new app.forms.Post({model : this.model}); diff --git a/app/assets/javascripts/app/pages/profile.js b/app/assets/javascripts/app/pages/profile.js index 028e1b0774..33c9f88f65 100644 --- a/app/assets/javascripts/app/pages/profile.js +++ b/app/assets/javascripts/app/pages/profile.js @@ -20,6 +20,9 @@ app.pages.Profile = app.views.Base.extend({ presenter : function(){ var bio = this.model.get("bio") || '' + + console.log(this.isOwnProfile()) + return _.extend(this.defaultPresenter(), {text : this.model && app.helpers.textFormatter(bio, this.model), isOwnProfile : this.isOwnProfile() }) @@ -33,7 +36,9 @@ app.pages.Profile = app.views.Base.extend({ this.stream.preloadOrFetch(); this.canvasView = new app.views.Canvas({ model : this.stream }) - this.profileInfo = new app.views.ProfileInfo({ model : this.model }) + + // send in isOwnProfile data + this.profileInfo = new app.views.ProfileInfo({ model : this.model.set({isOwnProfile : this.isOwnProfile()}) }) }, toggleEdit : function(evt) { diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss index 9676030ffc..793a0af3ea 100644 --- a/app/assets/stylesheets/new-templates.css.scss +++ b/app/assets/stylesheets/new-templates.css.scss @@ -1,4 +1,5 @@ @import 'mixins'; +@import 'new_styles/variables'; /* mainly for the post viewer & composer */ @import 'new_styles/base'; diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss index fcccab579b..444f6ea970 100644 --- a/app/assets/stylesheets/new_styles/_canvas.scss +++ b/app/assets/stylesheets/new_styles/_canvas.scss @@ -1,25 +1,3 @@ -$container-width : 1170; - -$margin-between-columns : 30; -$column-width : 295 - $margin-between-columns; -$raw-two-column-width : ($column-width * 2) + ($margin-between-columns * 2) ; -$two-column-width : $raw-two-column-width - 30; //simply subtract an arbitrary ammount :) - -$margin-between-rows : 20; - -$row-height : $column-width; -$two-row-height : $raw-two-column-width - 20; - -/* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */ -$cyan : rgb(8,204,249); -$yellow : rgb(242,244,9); -$green : rgb(29,235,134); -$purple : rgb(220,23,166); -$lime-green : rgb(143, 199,10); -$orange : rgb(237, 165, 13); -$red : rgb(246, 68, 60); -$turquoise : rgb(8, 224, 173); -$sand : rgb(245, 239, 237); @mixin wide() { width : $two-column-width + px; diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss index e2c29ff9d5..f82a7362f3 100644 --- a/app/assets/stylesheets/new_styles/_profile.scss +++ b/app/assets/stylesheets/new_styles/_profile.scss @@ -37,6 +37,7 @@ #profile-header { text-align : center; padding : 50px; + padding-bottom : 0; } .profile-image-container { @@ -59,7 +60,7 @@ padding : 10px 12px; /* when our buttons aren't there, we still want to maintain a persistent height */ - min-height : 35px; + min-height : 40px; .control { @include transition(opacity); @@ -171,4 +172,18 @@ } } } +} + +#profile-bio { + display : none; + + margin-top : 20px; + text-align : center; + + p { + color : #777; + display : inline-block; + width : $two-column-width + px; + text-align : center; + } } \ No newline at end of file diff --git a/app/assets/stylesheets/new_styles/_variables.scss b/app/assets/stylesheets/new_styles/_variables.scss new file mode 100644 index 0000000000..5d61d947bf --- /dev/null +++ b/app/assets/stylesheets/new_styles/_variables.scss @@ -0,0 +1,22 @@ +$container-width : 1170; + +$margin-between-columns : 30; +$column-width : 295 - $margin-between-columns; +$raw-two-column-width : ($column-width * 2) + ($margin-between-columns * 2) ; +$two-column-width : $raw-two-column-width - 30; //simply subtract an arbitrary ammount :) + +$margin-between-rows : 20; + +$row-height : $column-width; +$two-row-height : $raw-two-column-width - 20; + +/* colors : http://www.colourlovers.com/palette/2134203/Awezome_in_argyle */ +$cyan : rgb(8,204,249); +$yellow : rgb(242,244,9); +$green : rgb(29,235,134); +$purple : rgb(220,23,166); +$lime-green : rgb(143, 199,10); +$orange : rgb(237, 165, 13); +$red : rgb(246, 68, 60); +$turquoise : rgb(8, 224, 173); +$sand : rgb(245, 239, 237); diff --git a/app/assets/templates/profile-info.jst.hbs b/app/assets/templates/profile-info.jst.hbs index a293aeecc9..cdb6f3f3ce 100644 --- a/app/assets/templates/profile-info.jst.hbs +++ b/app/assets/templates/profile-info.jst.hbs @@ -34,12 +34,19 @@ <img src='{{imageUrl "buttons/service-icons/tumblr@2x.png"}}' /> </a> </span> + + {{#if isOwnProfile}} + <span class="divider">•</span> + <a href="/profile/edit" title="Edit Profile" style="margin-left:2px;"> + <i class="icon-cog"></i> + </a> + {{/if}} + </div> + + <div id="profile-bio"> + <p> + {{bio}} + </p> </div> </div> -<!--<dl>--> - <!--<dt>Location:</dt><dd>{{location}}</dd>--> - <!--<dt>Bio:</dt><dd>{{bio}}</dd>--> - <!--<dt>Birthday:</dt><dd>{{birthday}}</dd>--> - <!--<dt>Gender:</dt><dd>{{gender}}</dd>--> -<!--</dl>--> \ No newline at end of file diff --git a/app/assets/templates/profile.jst.hbs b/app/assets/templates/profile.jst.hbs index aa6dceb1ff..70579a3c0f 100644 --- a/app/assets/templates/profile.jst.hbs +++ b/app/assets/templates/profile.jst.hbs @@ -25,10 +25,6 @@ <a href="#" title="Edit Layout" id="edit-mode-toggle" class="control small"> <img src='{{imageUrl "buttons/edit@2x.png"}}' /> </a> - {{else}} - <a href="#" class="control"> - <img src='{{imageUrl "buttons/follow_hover.png"}}' /> - </a> {{/if}} </section> diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 158838faf0..0827a01d23 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -17,6 +17,7 @@ class ProfilesController < ApplicationController format.json { render :json => @person.as_api_response(:backbone).merge({ :location => @person.profile.location, :birthday => @person.profile.formatted_birthday, + :bio => @person.profile.bio }) } end end -- GitLab