From affba805247ccce860a642d0495cfbb1b64aada0 Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Mon, 23 Apr 2012 16:43:32 -0700
Subject: [PATCH] tweak profile top layout [ci skip]

---
 app/assets/images/buttons/add_post.jpg        | Bin 0 -> 1949 bytes
 app/assets/images/buttons/edit_canvas.png     | Bin 0 -> 2510 bytes
 .../app/views/profile_info_view.js            |   1 +
 .../stylesheets/new_styles/_canvas.scss       |   6 +--
 .../stylesheets/new_styles/_profile.scss      |  37 ++++++++++++++++++
 app/assets/templates/profile-info.jst.hbs     |  20 ++++++----
 app/assets/templates/profile.jst.hbs          |  10 ++++-
 7 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 app/assets/images/buttons/add_post.jpg
 create mode 100644 app/assets/images/buttons/edit_canvas.png

diff --git a/app/assets/images/buttons/add_post.jpg b/app/assets/images/buttons/add_post.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..8152e7fb270da3db99c440cfcbba2ecc85003ae3
GIT binary patch
literal 1949
zcmbVMc~BE)6yGH`r_owbiYx(XMM-u;4zdyv5~9dy@T4AuWQ7!Run7>T7gXA!Sg8dR
zkMTk>VjZZ6;}J&`JWv>ws^G=tRf~#Zt)kX+!=+9c|LFT;_j_-DzjuA_t+mD40l0>m
z)Jp*%EX)_61MkK92w+Onl*yR@2#^VL3;<X=NU2FiqaNjOv<9|9rAxrrN}YydQs_Ad
z8|DCkK_<OInT#2s1T0al6|=gJonS#~m6$b;9|=e5C0LSrMi!36W<||bW+f{{Dpt@`
zDA0tOG<pqYR6r(8iq?Rd#H>E&C~>x#IV`9TVoVmZf^AWu`H?Y@M2BM#pAGvdVF3aO
zcx;3Ri+G~R5En*Z4#MTYLO%pX`9c&%paEeK(QwsLR4$bb#3D2?YoMr%j0|>$KU;?<
zauAV7#DTdSF4vDh_!%;_Muo{wYw#NMAjJ$yT&*{%by~>gQIViaGm2S6ru`*o^pTN6
zj)(1*Mq{h14{b2YvG-{Vi#E*8)MFeuX3(YKN{oPe4U&o8eL9d0NMwUX<7(nk6e&`j
zGEIYNjbTzTi}=D;sZ}U9H~{wNAu>e7g#`f!5*#9th6n{hu8<ch2<6HKeGJD%kPs0U
z5eWnMAu<FBMFND9fM7n4uu5eJPXZ5e!?XsYLaW3E<En|c16;u;xu^uk6h<9BTc=AI
zoPd}lol$2<(&-^dET4@)kqV_+YqQucsJ~t*hO5&tl?>NupuP^H>R~dF357(~LLMya
zuUy0pfh7W%CzJ7DSQ<=J-p^J2pRRF;WH`3*_+VTHO~ee^jzhywC`0RmX^EY|iRG|9
z0i63r9#GW~O9)zT0;>VLAt4bb5}A0C$P}_oC{#+HP^mN;okpWF820uIhU3Qql1L;9
znZlq_8BPui2PYS2LR?(>Km#wwe(hu4kY=p`m~_Ak@FIasz>W!$n4q-|SVrVWCV}sN
zApjM$qtHn-1{wU&+6Nc`fJD+X5}i)#ClD%=OaVrYqIx1M?&!~H!LvS7q-O6td0FoN
zv?B!fGVtgJC-4Qbxnr3B@n*dNI1-WVm?S0;1pMiaA6Zo1ybqVpIkMSrY97}cyXUQM
z>bl_MdHQJATFIJKlO_TqfN{oc1>e_IxR*W8O)4Y%x>O&K<+^szv;TNf8MyUi`d5uF
z%$?AdifX$VKQd2cqr1&r6ivhV^QUjMEf@vmoJ&39E=};ttcK+Y{Ij>?U#`65Ki$6b
z=MBedJae<n`Ol)pu5)YinPOV8_8PtUd~As!{c87vpHfH^3Ahcaz1m%woZoh3VTo5{
z!-g-#mmU`Nsuz^~;!|E~vD}Gn-;k|8TC_(YmCSnHGAZM+p*)4Pe)Cy5n!kPIk^0~W
z(V9vGuANzTYE)FK-CwNO_@jmOy{M&%A2&x9x6hNiRV})nIO6TGy$;a+>RnG`EKwEw
zoN>-Q#jkojm~HnPv;IkEyew>n6M5*Sglo6JxHT&&t31t7RgaodMu+cRS^a4JCbR#>
z7$1XkVqy73K7a1Q)t0(~LgzzQyYfOxuid*@-(+9kY(6|GdKx;m7(E%$U^tRfwW#cb
ztfV+$PWhCk{d?4z)%!zh-d5e+R0`TncK50;nHuelWeMcFPl#p}>^L;P7~gT|*~Wvr
z9CAxN?Gaz*OzE_q7LU}x-91G;+Ha;<t{*#I@z4!)t55y)^tPr0U#If1K<3^Ud{NGg
zH;#0laq-FrmGLVgHy7qV7GyF?Hf|5kj|g`=XZb-Mx4?IXJuqSB@2>0O>*m|x)5Cj$
zBD~EiJanuvFRm(Y(_UVp&;8#PY9}VOZcgjmvZHn>@OO)Ife@4z6cy#%XqSS`nKJVD
z&gBBIL6*6MHrk?ftE+t1{N4R!I%cow+j-R?HA}9r$25}idLFk?&v?9;%5g0ZxFt-c
zwIAOl+!^l@Xa--4Yu`0HH!hBPL*?OHV_!Snee!(Cz6-bG=ip};C)-~g4y*0_qOrX@
cU8!6#-lO$$TYT&C6L*4cF22}4*~5DMU%*P6_5c6?

literal 0
HcmV?d00001

diff --git a/app/assets/images/buttons/edit_canvas.png b/app/assets/images/buttons/edit_canvas.png
new file mode 100644
index 0000000000000000000000000000000000000000..c57abddbac070ece5ebdf5b295cf7042c294a6d8
GIT binary patch
literal 2510
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
F`yZMqAJzZ>

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/app/views/profile_info_view.js b/app/assets/javascripts/app/views/profile_info_view.js
index f94f6d223..8589aa6d8 100644
--- a/app/assets/javascripts/app/views/profile_info_view.js
+++ b/app/assets/javascripts/app/views/profile_info_view.js
@@ -2,6 +2,7 @@ app.views.ProfileInfo = app.views.Base.extend({
   templateName : "profile-info",
 
   initialize : function(){
+    console.log(this.model)
     this.model.bind("change", this.render, this) //this should go on profile info view when it gets Extracted
   }
 })
\ No newline at end of file
diff --git a/app/assets/stylesheets/new_styles/_canvas.scss b/app/assets/stylesheets/new_styles/_canvas.scss
index 38f7d07bd..919bc9090 100644
--- a/app/assets/stylesheets/new_styles/_canvas.scss
+++ b/app/assets/stylesheets/new_styles/_canvas.scss
@@ -38,10 +38,6 @@ body {
   background-image : image_url('pattern.jpg')
 }
 
-#canvas {
-  margin-top : 100px;
-}
-
 .canvas-frame {
   float : left;
   margin : 10px;
@@ -182,7 +178,7 @@ body {
         line-height : 1.1em;
         text-align : center;
       }
-  }
+    }
   }
 
 
diff --git a/app/assets/stylesheets/new_styles/_profile.scss b/app/assets/stylesheets/new_styles/_profile.scss
index f814d0c30..264f61528 100644
--- a/app/assets/stylesheets/new_styles/_profile.scss
+++ b/app/assets/stylesheets/new_styles/_profile.scss
@@ -33,4 +33,41 @@
   .canvas-frame .fav {
     @include opacity(1)
   }
+}
+
+#profile-header {
+ text-align : center;
+ padding : 50px;
+}
+
+.profile-image-container {
+  border-radius: 140px;
+  border : 3px solid #fff;
+  box-shadow : 0 0 2px rgba(0,0,0,0.5), 0 0 10px rgba(0,0,0,0.6), inset 0 0 15px rgba(0,0,0,0.5), inset 0 -2px 4px rgba(255,255,255,0.3);
+
+  height : 140px;
+  width : 140px;
+  background-position : center;
+
+  display : inline-block;
+}
+
+#profile-controls {
+  text-align : right;
+  padding : 10px 18px;
+
+  .control {
+    @include transition(opacity);
+    @include opacity(0.4);
+
+    &:hover {
+      @include opacity(1);
+      text-decoration : none;
+    }
+
+    &:active {
+      @include opacity(0.8);
+    }
+  }
+
 }
\ No newline at end of file
diff --git a/app/assets/templates/profile-info.jst.hbs b/app/assets/templates/profile-info.jst.hbs
index ef9608aa9..3e6a3fae7 100644
--- a/app/assets/templates/profile-info.jst.hbs
+++ b/app/assets/templates/profile-info.jst.hbs
@@ -1,7 +1,13 @@
-<h1>{{full_name}}</h1>
-<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
+<div id="profile-header">
+    <div class="profile-image-container" style="background-image : url('{{image_url}}')"></div>
+    <h3>
+        {{full_name}}
+    </h3>
+</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 0fc16c895..ea123f4ba 100644
--- a/app/assets/templates/profile.jst.hbs
+++ b/app/assets/templates/profile.jst.hbs
@@ -4,8 +4,14 @@
 
 <section id="profile-info"/>
 
-<a href="/posts/new">COMPOSE</a> |
-<a href="#" id="edit-mode-toggle">EDIT</a>
+<section id="profile-controls">
+    <a href="/posts/new"  class="control">
+        <img src='{{imageUrl "buttons/add_post.jpg"}}' />
+    </a>
+    <a href="#" id="edit-mode-toggle" class="control">
+        <img src='{{imageUrl "buttons/edit_canvas.png"}}' />
+    </a>
+</section>
 
 <section id="canvas">