From 95538d4857ba7e36c54b944e7ad190c4d84c9a88 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sat, 1 Jun 2013 13:32:54 -0500
Subject: [PATCH 1/3] * non-secure version of avatar upload

---
 .../javascripts/accounts_profile_avatar.js    | 86 +++++++++++++++----
 .../stylesheets/client/account.css.scss       | 16 +++-
 .../stylesheets/client/jamkazam.css.scss      |  8 ++
 3 files changed, 91 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/accounts_profile_avatar.js b/app/assets/javascripts/accounts_profile_avatar.js
index 357bb924e..b228af8e0 100644
--- a/app/assets/javascripts/accounts_profile_avatar.js
+++ b/app/assets/javascripts/accounts_profile_avatar.js
@@ -71,6 +71,7 @@
             }
 
             self.updatingAvatar = true;
+            renderAvatarSpinner();
 
             rest.deleteAvatar()
                 .done(deleteAvatarSuccess)
@@ -78,6 +79,9 @@
                     app.ajaxError(arguments);
                     self.updatingAvatar = false;
                 })
+                .always(function() {
+                    removeAvatarSpinner();
+                })
         }
 
         function deleteAvatarSuccess(response) {
@@ -96,26 +100,30 @@
         }
 
         function handleFilePick() {
+
             rest.getFilepickerPolicy()
                 .done(function(filepickerPolicy) {
+                    renderAvatarSpinner();
                     filepicker.setKey(gon.fp_apikey);
                     filepicker.pickAndStore({
-                        mimetype: 'image/*',
-                        maxSize: 10000*1024,
-                        policy: filepickerPolicy.policy,
-                        signature: filepickerPolicy.signature
-                    }, { path: createStorePath(self.userDetail), access: 'public'  },
-                    function(fpfiles) {
-                        afterImageUpload(fpfiles[0]);
-                    }, function(fperror) {
-                         if(fperror.code != 101) { // 101 just means the user closed the dialog
-                            alert("unable to upload file: " + JSON.stringify(fperror))
-                         }
-                    })
+                            mimetype: 'image/*',
+                            maxSize: 10000*1024,
+                            policy: filepickerPolicy.policy,
+                            signature: filepickerPolicy.signature
+                        }, { path: createStorePath(self.userDetail), access: 'public'  },
+                        function(fpfiles) {
+                            removeAvatarSpinner();
+                            afterImageUpload(fpfiles[0]);
+                        }, function(fperror) {
+                            removeAvatarSpinner();
+
+                            if(fperror.code != 101) { // 101 just means the user closed the dialog
+                                alert("unable to upload file: " + JSON.stringify(fperror))
+                            }
+                        })
                 })
                 .fail(app.ajaxError);
 
-
         }
         function renderAvatarScreen() {
 
@@ -129,11 +137,45 @@
             window.location = '#/account/profile'
         }
 
+        function renderAvatarSpinner() {
+            var avatarSpace = $('#account-profile-avatar-content-scroller .account-profile-avatar .avatar-space');
+            // if there is already an image tag, we only obscure it.
+
+            var avatar = $('img.preview_profile_avatar', avatarSpace);
+
+            var spinner = $('<div class="spinner spinner-large"></div>')
+            if(avatar.length == 0) {
+                avatarSpace.prepend(spinner);
+            }
+            else {
+                // in this case, just style the spinner to obscure using opacity, and center it
+                var jcropHolder = $('.jcrop-holder', avatarSpace);
+                spinner.width(jcropHolder.width());
+                spinner.height(jcropHolder.height());
+                spinner.addClass('op50');
+                var jcrop = avatar.data('Jcrop');
+                if(jcrop) {
+                    jcrop.disable();
+                }
+                avatarSpace.append(spinner);
+            }
+        }
+
+        function removeAvatarSpinner() {
+            var avatarSpace = $('#account-profile-avatar-content-scroller .account-profile-avatar .avatar-space');
+            var spinner = $('.spinner-large', avatarSpace);
+            spinner.remove();
+            var avatar = $('img.preview_profile_avatar', avatarSpace);
+            var jcrop = avatar.data('Jcrop')
+            if(jcrop) {
+                jcrop.enable();
+            }
+        }
+
         function renderAvatar(fpfile, storedSelection) {
 
             // clear out
             var avatarSpace = $('#account-profile-avatar-content-scroller .account-profile-avatar .avatar-space');
-            avatarSpace.children().remove();
 
             if(!fpfile) {
                 renderNoAvatar(avatarSpace);
@@ -142,10 +184,15 @@
 
                 rest.getFilepickerPolicy({handle: fpfile.url})
                     .done(function(filepickerPolicy) {
+                        avatarSpace.children().remove();
+                        renderAvatarSpinner();
+
                         var photo_url = fpfile.url + '?signature=' + filepickerPolicy.signature + '&policy=' + filepickerPolicy.policy;
                         avatar = new Image();
                         $(avatar)
                             .load(function(e) {
+                                removeAvatarSpinner();
+
                                 avatar = $(this);
                                 avatarSpace.append(avatar);
                                 var width = avatar.naturalWidth();
@@ -209,6 +256,9 @@
 
         function renderNoAvatar(avatarSpace) {
             // no avatar found for account
+
+            removeAvatarSpinner();
+
             var noAvatarSpace = $('<div></div>');
             noAvatarSpace.addClass('no-avatar-space');
             noAvatarSpace.text('Please upload a photo');
@@ -225,6 +275,7 @@
             if(selection) {
                 var currentSelection = selection;
                 self.updatingAvatar = true;
+                renderAvatarSpinner();
 
                 console.log("Converting...");
 
@@ -266,10 +317,11 @@
                                                 })
                                                     .done(updateAvatarSuccess)
                                                     .fail(app.ajaxError)
-                                                    .always(function() { self.updatingAvatar = false;})
+                                                    .always(function() { removeAvatarSpinner(); self.updatingAvatar = false;})
                                             },
                                             function(fperror) {
                                                 alert("unable to scale selection. error code: " + fperror.code);
+                                                removeAvatarSpinner();
                                                 self.updatingAvatar = false;
                                             })
                                     })
@@ -277,6 +329,7 @@
                             },
                             function(fperror) {
                                 alert("unable to crop selection. error code: " + fperror.code);
+                                removeAvatarSpinner();
                                 self.updatingAvatar = false;
                             }
                         );
@@ -291,7 +344,8 @@
             self.userDetail = response;
 
             // notify any listeners that the avatar changed
-            $('.avatar_large img').trigger('avatar_changed', [self.userDetail.photo_url]);
+            JK.Header.loadMe();
+            // $('.avatar_large img').trigger('avatar_changed', [self.userDetail.photo_url]);
 
             app.notify(
                 {   title: "Avatar Changed",
diff --git a/app/assets/stylesheets/client/account.css.scss b/app/assets/stylesheets/client/account.css.scss
index 001a2c0fa..47c9e8de9 100644
--- a/app/assets/stylesheets/client/account.css.scss
+++ b/app/assets/stylesheets/client/account.css.scss
@@ -81,11 +81,24 @@
     .avatar-space {
       color: $color2;
       margin-bottom: 20px;
+      position:relative;
+      min-height:300px;
 
       img.preview_profile_avatar {
       }
     }
 
+
+    .spinner-large {
+      width:300px;
+      height:300px;
+      line-height: 300px;
+      position:absolute;
+      top:0;
+      left:0;
+      z-index: 2000; // to win over jcrop
+    }
+
     .no-avatar-space {
       border:1px dotted $color2;
 
@@ -98,10 +111,7 @@
       background-color:$ColorTextBoxBackground;
 
     }
-
-
   }
-
 }
 
 
diff --git a/app/assets/stylesheets/client/jamkazam.css.scss b/app/assets/stylesheets/client/jamkazam.css.scss
index d11d9f4f0..5568fe74b 100644
--- a/app/assets/stylesheets/client/jamkazam.css.scss
+++ b/app/assets/stylesheets/client/jamkazam.css.scss
@@ -417,3 +417,11 @@ input[type="text"], input[type="password"]{
 /* Following is a style adjustment for the sign-in table spacing */
 #sign-in td { padding: 4px; }
 
+
+.spinner-large {
+  background-image: url('/assets/shared/spinner.gif');
+  background-repeat:no-repeat;
+  background-position:center;
+  width:128px;
+  height:128px;
+}
\ No newline at end of file

From 8e80b76e81b299769f9feafcabce43eeed20add0 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sat, 1 Jun 2013 14:15:49 -0500
Subject: [PATCH 2/3] * adding public/private aws buckets to production.rb

---
 app/assets/images/shared/spinner.gif | Bin 0 -> 12433 bytes
 config/environments/production.rb    |   3 +++
 2 files changed, 3 insertions(+)
 create mode 100644 app/assets/images/shared/spinner.gif

diff --git a/app/assets/images/shared/spinner.gif b/app/assets/images/shared/spinner.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ccc99328b3d9e59083f5b4d4d7c397c83b00281a
GIT binary patch
literal 12433
zcmeI2Wl&u0mhY1{xCTOScPBt_3kd{=;10o|fhI_BNrJn(LvRc3kOV>_P2*1E+O*&f
z8QwEh_uQ)co-;Ldr|RB0HMPI&5BuBix7PYU>)8rQZ$-r{K0W&Lc?1`x{{8zm!*5)5
zc^&OHvhU;tcwanu{OHjmhAT8|%twzOaX-BO`=@{0hs0NmP~sQ+H!MbTjY=X2!q(X=
zts_fEDqcI`M!Uc#JjGUD)m~Kneu88A2CZ&hVlqXM>e;!|>k`e1%B-J8uG2hPBWDCZ
z1diGqF_IJ<ggR=BgSQT`a^33$k6G_xgC6gB(U<eLoqBqwmPcrbPRt+MleN#ktO#Ey
zzy?w1P@JQ~21TRv0gGOl!!5&$>-&c|(c&um04js*&ejpG=o>#SUyAqsF*(&;;AQwN
z9u1F_nyD$`#;zte2GMj!W2}u=3+<LOqm>K;I@9*8)bgSQ@zlMQK@f!U)$k3`jjlfb
zG>&G=a0xD83W1Ppyq^ab;zfX&;|kiq8`R*K;g>%*21oM<6Br@`7<|A?v?&8Rw(l3T
ztcf#t)y7jOc1wpCU-VHF7A3R2OA~s6E+t4{qlqh(4iFW0Dc8zbh|oH-{kYpv{W>|x
zL;P_iRUQ40MIs3;*j&}FZ-=QLam@=twcWf_$GJ~SUA(Yk)Ab8J(=MM29M7kh-&Xpg
z@VQv~FTZVqBp7k?Zpq!PMuLP?cEEEdHshg6OV6PTrzX>dy0})RS%(gDz3<1;y0e7&
zmfBr=XLF-3TvnSuFA<yNTmm;66I$8-hwuN%_x?Z0m+Fd{8T=IT6(dgAMqHJBT221B
z7?eL1rd6t6r>C3sd>-;mv6U5}tXDnV6yl3v8t!8M)Ae*q_$%%hP_7Gps<#ylae4cF
z3(boe5As1N@0NtgJqKwm+rLT=N-;@4wi->O&=|-`Kd~9hltl^A7<kMLRPxNdks|lp
zn60d6_jJx~fe&{mg|Bo|c-ytPhk^uq#DOjwy#e{2d6Z&E|7K`f7?5V;6h2Y!&enD(
z;j*=XtIyZVBY8cyGIt?`k`}qTglA5<0DlKw++L&EG4cJ677tqV;MmD!F!&MwBC2W|
zV&K}12zfzVxaS%^phJzH(&To$H7Lg5_xUuVVY`fx)BHXW8_uYn%%$*ad11o#SN<z`
zoK!^;`^j7tSK-vFCY$L5ZHsfXUoRXx`0fUN6i=pdNqu|V-N0l#&Mn@AJ(Fa$G|nU1
zHo6B%?F1u5x`!`;B^0EG23-NzzfJY^;QD=ow}61<41VjuI5wGDCo!%aFqVir#@>}+
z&v+3T7q3+2OIT}?KA|+i$o*j6(Qc{-_eR)$se^FrVDz2P;rEE}lV`v#XXI9Oy5Q=_
zO}pEVNk@q~GnDwb|3oX<EK-W+^3WBe&Gj#Xz8ikS=0qL?t?I^Cg^%LX-kXv*dIIHm
zfj##NNV6$Ko;o?7OrW{TH<y`Jm(d}qk0-NtRQ7fB?ZH@HX#E3EE&4w{JCh>O<2QTT
z;Y$|e{Bk~V4iw7Z9*gHSX*}%A#gNuCL%ca+$S(!)*VW!qqnP%+zQul7K3+Ik{!}Vz
zI&<QyYBsMkPU_xNxlWLJO;odeeYHukDFR1$VeXqXC<)#1oO`YbP~YIJa>ip)?zSsX
z<4DG_(xugUJlb*LGXDKb%{32o>I+Li6q)1QhUn4ypf8&?68Fk&av&?y6<G}zw6`u&
zpyG0-JhPuEF!b`Qp*Xi$NO4eTL6BcqLL+<x|D|Xu#6q1ADbU=m?kyf#V{OS5d|G#8
zE<tl1l=mu*CP+xbH2<SaE~<?WN(kz;e{6#nqW7WyhaL7Vx5sQk+6%=Wtml>XMCA3b
z7%~yJX@ig)^288nPdta?XTvGmk`2p5L?lX21Z$?NDFmOW#{kXJwj7R2$MSg%acFR!
z?SYElWL|q*6IV{;Bz`SzqD%o4gqy5qW-Fkt&3Rd1$C>Jrt}nPdP}I`Qk!~2fx;Bs6
zcwHEq)tUF7ck8DczVGmh#~--SceZQ@jiq@zce&F8GUZ|_c3KeF0h@}r2ku>+{1`9#
zoydzXDgYa*)DLz>Q1Za%KiEyZr9N)4UFz6BLXM(DJ~T#$XOjX=fJa+(>4NEqTOY*U
zq-%UdUY5A$>S8M<3YqJTJe&e0xAMyQKK@rpZx6Nne?$N2>>KAF1FF`fL}S110nbC7
zwiMwbAQzgM7`Zh5KBW|vfNIIK$$k~Lx8>j%iapyAX7M+qnM%nCqv@hNk9Yuz<X>}@
zLj{~Wp6nMCV3Zrx19V|8%JT!=pkIZw=fw?r&wUr0s>KSp!Uaqu#(3n~P+M9g?PI)e
zI}T32++K~<3H;c=YV7wLd!gF1OG4$Y8h`YDD3pT^BWLc|vfoum=A1h7#1tGU`)0t7
z@+Dxx&rn1i;Y+<Wb^AUUNu6yC^lag=UFp8^gs#v&c_wmY?CrQ+_c_RuHtWiIud3vr
z1>(tofcI6nqvG!T+*UXEfP7<164$5eb0RLNo`&nonV~5<^V^=It7~+kN~HO}Qjh<y
z@?!Kq??q+d?pPsLqWU}E0h6g**8*Q_-^mJ^D&SY!65m*M1E6Jq5qIbGfnp8sr;dP5
zJ!caO<Mzq352rxmPG9^sL?;K|d(1DGR2)w8d>j2i&**lRTI;QTC7dbe`7gNI4n*U-
zoG<$v+D#Nbju$o+cLR)6q4M-h7d|?6)ER<GrHl=n7g|5=-ZxWuxvcg2pkGKWdmovA
zBH8pc|0!U+rp4$+NW;yEKVwts4n-Uwsg@T9R8s|MV&C1qJFX(=zXbGY9x8Hdq|j|8
z?$^tbLDoFnVs$<nYPHtS1W-)6ii(t$((KM>oxN>>y1u!R2%kateeYg9OJ~6nmA5xA
z@WN`&5S=bZ+xKR=5^dMpPxf(`ZXH_K!j57S7dHSzwOwSwninf8u|^`q9j^e!{fo(d
zTuW7kxZoQJ)y5kuRgUVekR{bqJcNlP4W~2oGj%S_ubecpo|ynsH6$QV{k(=C9E$u-
zFm@qL$SBhbb*R%DtJ8?hr}jU5l=jSfEMF>Evmfz}d~hA(i$1e@i0B|A=6%d_A)Iyl
z!A<li26;XDp}{Ss1P)z+>7Ai%749nQB5OwX(zFa-m$wZ=#BAdpYheQuN<a6gzP?Yf
z+^Co=<1Je&$V$16sHCW3tOragSK5vh$bg82o(MnHk2mw#^2fcXoELNy;mp#$*n|rE
zC_wP1=3c+&4dO$V7#sAx=Z{3t{#r6XS@k5|(PEewez5(Sj<4}{+3?7Appb?y)Wqo6
zVYq@PXkgjM-3d}BRfl0}eCjmWu4eTbYJBE0`@?iK%+$owZ4u;52!fhixUEbCkg=GV
zUVhvgqeH$G%;KO}TZr|dBMaoeM8RyzT{OZ2yf5~5LHWFSI9Df=6eGqJzi9%F(Y^D7
zxQNOzKV4!+(D`Er>i<7*<rVFW*W8&GF}Y$}BU?sjhC!?MOq)eH`%s~`y^riwd3&Vc
zzTpoFHh}E4tvJqNMN~&=R=*MDO%^GxSSoJw5@@;#4KBf~DtT+~2hOOj9$CJ<!86r?
zYfE*%j7C&<(?AhwJTxm$fMLce5Q$n~|H{fK!K!P3whW<N9ICdLZWR@u*YyeTi1^g<
zkUsM>j_eDky<Lkwzis;aH?~KX756ce+O9E-nhd|_=+IejMUxbjco+yvw_1r+Rle{w
z{xb1SvKoyO*#_ga2`Y=n)TrLw@_SgZ7mEe6oVDppPf%)D*jOs3q*awpSFUt$rgHJu
z*?#xU0-)tCHYb7Aql|vlV6<zj_3(6r);{f2JPrIwm5yThu6~<G?1X+~USok*$GEJ2
zWHI=W1Jw+cKeih15gPf)J>dS%*O@wKhnoC!N2f$SyR`WF<$++G`GG6XwI_VynGvc5
zAL{}LEk}{Y-%5BLZuO<p(cMb&pX_CpjRCoHeC-du`8%3Jb3M-wa@$vr)mJ9GD4J8r
zDCuZBuiQ6wH)ZKo(GD-pu`$<WP$s_WB>(N)2z7MSlgP%o&2WH4i<lU3`$}fybifzD
zmv~e)Vl;*Ue$JUS(Nw&=G)_=`NPv1wt@I_-tZ9UqaO@48xl2!8`~^hA-9_<xkjgv}
z$sVd8F$5?3h10x6fmB2nt=5ArjERUCN?hcD_Zv&a1ZlZHn8gyAlzB+?k2Uv`R8`Vh
z{rZ<Lk8D#ixg77u+n=(&dn&1U-7iKGJ^oc8m{m9Hqyk*>Cfhd!r<7f(ilE*y2BsUQ
zmtf)*mWy*f*VY^{K)GOBn$6rQx^|9h69bU!L>>xEaV79Ewa4xW6H!NgF#gU$bfBd=
z_<;oU{4Pl)8vNYKFJ)Kuo=MEoj>SgaaR3f)5*V2m4yTTdZx)$*WWkgom41%9#3Hkc
zE%n)JSkFgOTN@wW%K|DB60g%U-zL0uZLg`Ja9ii`VQ%wvJh&_DBzaXfJZR|-=&6DJ
zPXr(=c4{(;Yz%9;X|z~12rYeEIx<vI`(t42X1Iw9)CxdZLyqq}ei9z)yd+Lew~AQU
zm*s%$rgU`GR<iTFfvJ7yv~X>~qlzBKdSTpcTNZpQ=C6m@HgTb77BnyyuHULJtjKOh
z9!7rHx;Jx4?j0ejq;H>zS;5k-G*q4$S;20kd~KT*#VP6?dAd)DE3tS1aKlaSte2S0
zJ~DnT$?qou*RRe7cfyzOZn>$|OdKU+O=@yRyAaFxcRV!e0RTU!K%hsA888>pv&b%^
zq4B$oHz+8tHxgyIr|~@hQ^O<VO<6>NSTO36-$_4ynJN@XOiSV&Q6zjHjZdWBWsp!j
zC__h=L_Lq%QcU4AtabAFrKy||b2<@YePRpF5icBkxga<+mM$BB$786&KKAu(x<I$<
z^!5~url9(Bt>&GXQo+{A!Kf)Noia;>PY9iJu7xJe*#@5VbLZejiS7Fc$GOKVUC!qM
zkyzwd=1hT@Q@L*5FJgZBKl`n_+`_fR7jq)6C!VQn)0rOa(b8pzw5!eJP~nAMyoCLt
zCnJs}5rrJ6*Rv=)>q-z!dbhuMGm4M$WLYb&0O)Mqa2;(}8S5{{cDBOa^(W660BJDK
z_rF!Smmz5OKCCVHIFV`O-d<$v+BFiQXkGpGHcN_8wfEAOw?~8l5VE|yfV;c1d|es_
zt$%7r&S`VBdv5zpW9Wv0C8N%RA<8h^h8N4TKW<yv00(~iHvzr^>)-6*Pc@V@zWEr&
z6|gd=GT@sQ&pI=99$9u;K55hPOc=3KzV0M#6+@9X0`n9OuO!TRK^LbO5sc)!y7sPn
z`eojIqGx4;m@hKU4Sa^)QdDe<l|{CtVn^BfvMwsli?v5Bz(jp@VVoSs<-Q|X(aLsJ
zWjEN=umekO7V5CBul~x*JMaNj=DTQI`vAOLW&9!hQW~s07NBAt+}W%K>D+k#uqp^b
zV$rF1uilj9^UTx1^E(61F|If5UeLexIDYw<yX7fWw=+7$fP2PMOZofAX9wFO<Z1=K
zjHrA*QtK1XDy7gVZ1kPJu$D{a>MhyQai364731$<o=@6T%6~0ET+)8bK9;5IdQM{K
zVW};aTFP39BgC#Jtk?RwzG8-}qSi9@Q>bAYV7AG8sNt7u+JUhVaCfKNQAFOPS;jpH
z%w>(z{jP)-&*DVNXUP&pmTeDj`)tvXxc<5pz9wLcmR#Yn!fhyMuTmr%1a$K~O`pux
zX4AtD5we~8YymQJl!$^4HwB&Q-7UER**cjp^If|>x`KvK1a>huK0AApVtnSyISOYW
z`c8z$aEdrb@50%@X`nX2)q%oogI9x@WX<L3OlLYOGw@pO8o%$0M%1eQUExeR?LY4z
zIZd-+jVoPCgkc&AX{8*cFz*&5ZnXf`T#NAT^yo!6LC9rT%lm`~4~ox2whk5U$|B>-
zr;Fu~Z_6Qiv-qGMPS<o3VXFy_vn(1n^L5wu6!k`lBf7i1p!IY#a&|?zHY@K4_QJM7
z_N~1q6bxcYLzX_lnH7e86l?8697b|RI8UOod^;A4VAqS3H!oEVEc{ebtFj+2jU3^|
z^htElJLTvuqb-8TNqxhx@udRv)RcH~1G@1mMw=xg?w~Y48ufdp`+;0!_kAF;r!)?0
z#f&$f&YUo43`igzbaG0xh4~@>m9IOT=x6Kr`@SH;C+bAu%tk*30-uSnN|GmT%7=fV
zH=~{>vXBpDqlo)zFu6gK!Y5UWwxDIHmdbAk@$d;}rc0Ljh!HBLvqM+l7b5P5lNzaI
zJM`gcP1GwU^=iX9x7hX6s@W9tPW9(hqzCi4HbGx&I?nBl8>L4EoW;|TdYvxG(2}e<
zgkf_)>>Ul+{P*>k$me9VEtl`Cz6GyKW03kN+V-XUIU|oK-0e&YMbvmrw@&wr%VjER
z;a);DvlV7@cgi>NK>behg_USy&*~Mnh;)H_X4SvmF2uxRjUWg&RsK9=tSDU*x@{<?
zkwlcn47Jo24Xmil<;1)>hj?A}?qPeqT06YtyiZU~7MP2P$`h>+dXs9}n(7pTEA6ej
zekiJok+1plqy6T6(`FKtlt8b>+O<?2Dja=2K?Li)o%eh)d4IZrXoNi$HakW8puJ(_
z)t>0kRmG3;%k+I8!$l527A0r7a{o09AXvGe5b4*k5G8(K%oS~ci{mf5JaSV-jVHlv
z65LgtttwTM9^LH-RrSMDW4eP=<L3>$1XShSw?Sz4@8hWWg2-N((|P4*%8aeL5Ym0;
zzgfheW;>)${gO=5VSzQaP7#sHtWILbQYdvK^m|ZgLJ_2@;6kTB$>lI^MUrqWTFTr$
z$=nzt&_3bsBftvDWT(n<{CQlclF#{hc6xwik1|oh`8>ve1UeC`R2D{!^SpGTRI!yk
zH==n%qr#-Zw|TJvuu!$T*ijRPsFHu_wi{ON=!LP;<$ZpfyLQ1>`29=pQ(n~xa|`xx
zbhfz84F1Kz05)w5r>o;Na2CEh@>cY{T}Qr9IDuH!>EbjO<!`Cjgl6hFe+!uusm@cI
zB^B3$8MVv{`PEeY5mNO8Z`Yz>5h}abWfhO9rW1AZdFqps>A8H5_}gwp@BSG?oOu%T
zhtJTylnb5qU$_65_zJ2u!r~mAh6f35X9>fgifOjbN-N!4kevf-e@dWn4q?0c{qGWB
zaqT=v;I<I6k|*#WL5*2!)ZZk~Uq3W>kU-l3X*Au_W9NEstKGWF;j^E&I(J(3Z1APM
zW`qZMVtE_+wCE`o#lx`Ga`4Hl5E~kD$39eQ65GZ$>L6OYny-)Yt;_<Pa8jvAM5n4~
zS4|k7L=)wBR2hRi4-(-5;PK_-<z_r7o&ZT-;*O3Q#1OPQV&h?7tai_~;v1M@))NQ3
zzn_Kh_A1Ckxa5}v^~%hl)V~M4-5~lZ@L}bLAoko#6U71g{x8|A$I13YpuR1BDnY$H
z?+GiS1T6Wue)}Z+;S@o=hTFa4lDG^3iiv89Emn0+an~e&%Th}rh0R*|{UMFmcg0`Q
zTC|K#E2zrW3o5C6(KudLAu}k8hT|Nis*}F&^o0q>=@m#!RNGu>D=nwEbF?@+oY#(a
z`MMt?MowH-J7lo@URD#mQ2pUcq^}9y<uM&%r3v~hnS5kALd1`Xg^9heAIpJ;ol8)<
zJEWEwz9Vfnl5?EPS{fKwx)#n`D5~2D3?TP@3ylt%TTzlchHquYmW6?r|3K~KYiNgm
zpfT}WgajCq0bTu2^8cW%KX4zxec;{%`LnH4;f57Gv~{*pPLDsium8zi`%ms;Fl^_C
z;{T7i`~Ew3YMs_quD^5le&EjjH}32Y+=m3O-f{S3F1TZVcWB2}W)@f8bTA6e%6d7p
zczp?L;5^VVQh6O6?ba!=4I9CwzNJzz>GG~tg+;;kyRN9EcyjSf1IRzb-j%71cJD&*
zR=U;hS!w-ffj!b`Kt$XMuLgR)X|JbDTfX`97$l$UlNT0F^=s5xQV0%FpyOrVnq<Up
zaxH7Cqm7v17)l<+={eW+z65fGq-Fc#uL^OThToj7_H9Pu?d%~b6_Y!!GFU)I{lO<+
zA>412NCVuOtR|ymK9@R0ag=LTFr-sXG*=VqvgmPmKF8Jt>BXA6rs#T~s~AXI@s+YP
z>cO?kT_*aw$7dbQB0l=9#EQ2%tP%w=;k`8!wOz{(&t(O63DjHWhcYy#IvFB2yYU4#
ze}O5S_k!~%l=7+xPA&6F@biHPEurn+Z;xHf@Ee5zi^b@$S?E$Ne7e<c_3lpGTY4)U
z=O0$}2m+%hr)kkRf2HdtBy{64b*Ca0##xB;YiPilI~UxY9lb~(h`9`Fei+(v4?}y$
z?tdHFCJAXX_?SKK`O~`u@+X+jQlXwI>o2cz;_6qABm$Cy)-NzK7$W2h>_tNq3l;lC
z*W0i-m>1p{I`{-*7Yz07w@3Pj4L`m%R89rBS1K!A13HXe9*hqgWv3pvMK@NRR*mBd
zR#S2L<`6q+fyeQ3;8bc|F^AOJG@Lg$!wXU{d|q0JsIa=aJtQ`+oM0akhq+3de{aec
z6i+DP(yK8?`0jhqJB%Hs!2$YLA=qd9)kO)bZv=>_)TgzG)CTsVnW^2ZH;#%^6Buor
zZrvKJF_JiSzlO{cZ?$K<H<$!lo$SQrh*KS@&Tp3u6bLR6nTj}%bvlMel}dEH%qA=(
zDNM7v9;|p(b^7&ZRMs@MZi>lWC{4&|ZcFoQ)3J}zGbC|4&pz$G;S`TqzVAf~dDT>{
zYA*wt0)y(4L$y98qD{C;#t|tfeo8Cut0-_MBT3C{1$)6|w=17Nd__WB&7mhvrOdN^
z(c@sOPGW$xp&bZJZGN_jZ0fW|{p|gmKOoWN2H*M|C5Rbtb2Yp=X~;*&+t2|&0Qmua
ztI*tlP;Gr)bN?XF|5@3Hx=#=6qj{FQ{PO?C9y=B${&)6sqZeTWPFG>y{)+wI0vl!z
zw`+RWMuBdRP$Z0?d6PnjMzGg$?OM5qFXa!#BN2NMc1<kri1K-m{d_Qagdp}>Ic7V%
zL&epg*nTGV;-LPpm5&2u<YIfr0_F8Jg`W|J@rbXZV=||2IJTrj7H((N(gA0L-{!+u
zSM_ts0mIj*)g*aLN3%<o@dA0wg1c*+S+_g$7Kc_=E(v<sW%3POG(>jten+hK+M2U}
zy0|2YVS2G58}ge}Psx6;kSgMIutIPTvGM98TAlKB--hNYMa*Dnh@7Zfu~0H|MZHdD
zy_E`(?|JRCy`XJ!@-yun?npsKP_E#_42iEct7?IAPzRn7KgUFgMmFP2W{BOZeEm%I
zkIK&~dkYPt1G|czt7SA<PqyDJ3RU*=k$@m2Bj>!?UA_*72;*J8HJUG&HyloF=o|g%
zq-?du39cldFoq||;E?0@BiAo9gb&1C?2U&gBuhJ8H*HK;QZ?$0W?DEBXFUexiDsW4
zOtn7QIq%H&aB1${o<>S^IlE5iq_c_Fiinx*QWmVH)}s5_Bi^-HodeM%t&TD)ih;<S
zTf3902|j%n7Tv#2cYpiy=g$WJ-yyfd@%{|%6f|l9wrYk_HL;`k?GM2{10TurAOnQ_
zezxX*G!O|Sh`;Y?iJO;B&!g*gF_ZCkKPB1_v7sh*xPaX`vX9YrM-Z}Mq==4N$PRqM
zL}xv1CEEBEMZpo)G*7gt@C6(H^@%s8wMrbH?trxqh=ndhL<mBXnY5*xFXn&@xx(C~
z&Gq(X4ZwIFtNoDMRcipB3g1;@HRWx=wmJ3cWPXIn<D@xhHrhF7>2{_#FV(pG(hF75
zeTdsbhe=a6!FBw-xQ{X4j-(zk^ckWPYD=OWzXyG1zW8R6>Ba}nCI^jIN4pb^70D!G
z1XOucPDOx<N=vTgo%9>c>pip2KUOcYd8Z%WZ3#n{Yf!M#fG+vJCi}l~yAey{tO$Zo
z0O}pes(`VJQ-b_4V97axG6n%5D-uE1kKafyCfG{`MlrJ}?txz@OyD;yW~F^g;%Y5~
z2C@zDi<<B!XTt;+r}FAIKZ%6)9A+UtbOeIK*Y#&fv4SryZ0tYjE0njCf4OXHozED2
z?xTclFD6D-cBLdV+=^|qCl-NIK{;Hpmo;qU;H}(2>Ah6%IOlj2P3o@?Gsg4h&QZ;A
z>{z}4+;EfENCeC~<-~T?ERUKXZt<lYrPNJ%X?a`jg;iHL189}ZU4nwHfcZgcV=^eh
z#2(+@i%=`(Z~5#pPo4<qu;Xg=g%+~DUAEFRlfRFk#I<?ZN<=RoPc557;zKm9@R1Fl
zmOBGU-;%(4#3Hw#X{nSZ?wSQRbYC4UKnov8;n*+K$Rqax6fcyQOqZ*rYN3mt0a!DP
zS}74xEF3!Dbo*^ts`|P0n$)NDY^Z+KD7V?PPogvGPe9u|FJ@oikk8Gx2KsEB8IilJ
z_Hz-0+f-k2Z4E@T$y7Kk;Ov04gx%xT+K_g`Neb?VPLz1CX&=2tg3<J|?a2nVHg)_?
zX9P>D+OB%1u^?itCj8m&05mb=N^z<JD?!$k-ELT+SK__MA-J)=Nqg)_s?!TD+!fwh
zf6Q^Ax-)cO@6yHXU!`Evf#MJPP<C`gu(@MSHyh+QQv?m*`UhLzzh`>g#+B9!{IK}&
zh=--$_K*<(Hy%dS=k7elv9fYov2>@}W5KQ{5EZ3Nay+#)UX;m}Vq{@yss~Ohx*P7m
zIbwEV^&5TKWMFFBTITjhQj?DD<oxFIDqG6#1!(tN-u{tyTk8CKMYi2G@*!bt4g)VS
zgUmF=OpdF_c90U5QKc9li_=#b_Su)sujG1|5*Js&?}y4xr|khIb@;;sh`z0&hKqwu
zxFvC86=LN~oU6mSi@M=Zr*=-$14(>Z=fIdewH{~FL8PdLxyvf=kXmoK%orhR>|L)~
z7Dn6%W&-_dpBpq*N&BI-nlFTGydGW}iEr-19%Cx`?+}f@jbc>F;?CTm8;)SoXVlt1
zwi(ILp$+}IfW-=77uG=POrC6L6o`itU=L5SPh={)(yJ{@4^D|_mXOu}HaYc3wQYbk
z6GFTC-;6-C9FA#E7MpZu8_+k;YeL)Hmd0xi=($O|y%7QkKi1+kb)DaT#C=cSwP+3_
z+wG1PaeX!vz+wC`2i?tdM1kK92+uenoN!T+IKv}5wVbl%`f|GO@IhqW#d?gC6Vft}
zO)dzat??6amiu7{dXdL;=|cM}@#4}O=v}-qlB=aZdLr)fF}NythBtuEd%6CjpNzD$
z1IlkVIU6J`CZ!XHGviLS+!KEL^OS@EV(y|5XoA>%{^<-03+=Pz_CL5}{QD8$ed9{a
zO}z8QWyqGpXBeOeINigi;&qJQFKT!(Ed8XzUoQA*iG*#G9Lt!P<#j<3vo0gTRA|<j
zL*=Bj|M`aue_3-dm(VP}Rn=NTt-f^G?y1;qxJ&EyMH!j5(B5OLi1`A8!ND~}ObWv`
z#Y}qa@GGmUL7#$sj41lbx0EokNPyxD&aZ12a}|kWlx<bVkgrObgpbl9*Lf!ep141#
zN}>brmILe$bHa<|j#ZKJ1!r=X2Mp6l5bOsG+99Lj5S{n8$hd4;J~=;Y4ZdK)ru_Jq
zDAZdS>L*Y19@~Gw`WeE81GDmuqmlc9%jQ;Y?}|Ne5Mv|krpk0=^(LP2Ac4D`jd?hl
zQy<{8-@pXUpkJSeaclV6M=zoPfg3WG4d&u}-nhk1*^?>8Ogz_tC3BD!(iKW4iqGt;
zRVmcRO(-WjYS#%kCxyy3Gqg85VU}z^R?lk&zV{+o5+<8kVs~BIE@^62Hn-e(G{+)(
zslM(Oj?PNjl%e^aAfBoAwNR#t&Bq{$?9s6H`kv8mj7-B_A*b9^K>4wErqRuG(;V+t
zlVig@DVEMYj7+Gl1KS`;riAOGV<J>*j<18xLzipa1i|%kWs0{=uFP}j>X_P6aVLQE
zVkx%SyTZIb{_^LN|8MaRxB7H)z4b$bcQWDWNOHT!6vxC&FX27h8*)kU^yfI;8P{}!
zp}94<>O9hccg}&t*%Fa?wA=R(BEDWZb92x5e7zpjG75$L{gdt~(X!xSL3aqw3BS`|
z9gW;)Vm4BL`}z>s`!DlftaHNotw0QPvU=S6hs?tfU3#TX`$^m786<D-i?OY&US-2R
z^k9ocr$Ve>f1c&6JSNe~$WDXY$^rK9%F1}<g(zb<d8-P(5=<zEu@Qb-D)9W}8w;nY
zJy`6JYQ#Y^W_9QKg|0pK*^t9W0y;V=GG*2gj1U%j)~2)08huAQuw-y(-jn!TgVlfG
zkX<-Z+s5{G;mEc>RZ0fKWKj_&TqV)?fkzl;ced&zB+WnT*m<O#|6;Z}<rFwo%s{9g
zkn_=Pz9r~D?P0xCwCLvWrmpAVE(1Q-DnUlGeCf43`7wUibj8bet<Bb5hLB9!?P_>m
z5Ck;8IlVX_mfc15tOlLRlbL<GQ?sC<{twp#|MflMwtHp83!R-@QAF{hfp^MYe|g(x
z+hsW^hmM$7zgMJBL*(X=VF`t=h_dpfR}`Q;%6_pDjgtxYCe4V;CmL5SyM5&5+HWeF
z8IQsVK9VIF4Zi()v%JqeDr?&95o=o7olA=74iVv<>6VX)CZK`XK#;As(iprhROY_}
z;t4k)wY1IgKV>u@BYsen<5+Zlx!o&d*e#?Zi4dkvDx801$#fq>z#X+duSv&}fc<iS
zG4lHsV+y8@k)=cbCQSxT<6Yr?5}A7Du4k10-bq1e0T571uk64M&Phm+))`LPXDcHs
zEJ_iNfhklm*Fz?aU^`lQU%uyU;!GakHC7Qcd}K*0U2cDlKO{>v$wSp8v+-r!c+!RR
zI|q8YU{33vX@39$X+u3<Pw|t7L8IQp@Yo#8FGRTG)C9I1!(*R&L1VOL-%TXj_$u~V
zXm8%xwzF1E{Adu=PSv=wEOCq)`+-X~XL)nEztu;`rO_Sc<qmyS!gc>jV(bJ?|9*8=
z8hUXy1O`1J<Xe_>JsntJTD|Y~yMk`5%cMK6-W}h<$Z`+D<9-3|G`$i(oz9%m1^#vo
L&;9eBK;qv30jq3i

literal 0
HcmV?d00001

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 03048d054..fb9c5eaab 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -76,6 +76,9 @@ SampleApp::Application.configure do
   # run websocket-gateway embedded
   config.websocket_gateway_enable = false
 
+  config.aws_bucket = 'jamkazam'
+  config.aws_bucket_public = 'jamkazam-public'
+
   # filepicker app configured to use S3 bucket jamkazam
   config.filepicker_rails.api_key = "AhUoVoBZSLirP3esyCl7Zz"
   config.fp_secret = 'HZBIMSOI5VAQ5LXT4XLG6XA7IE'

From 948fb2f9984fccf4d9a6b1f6f6e77efda27a7782 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Sat, 1 Jun 2013 15:01:53 -0500
Subject: [PATCH 3/3] * fixed a delete UI bug; also adding in new default
 avatar

---
 app/assets/images/shared/avatar_generic.png      | Bin 0 -> 4133 bytes
 .../javascripts/accounts_profile_avatar.js       |  15 ++++++++++++---
 app/assets/javascripts/utils.js                  |   2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 app/assets/images/shared/avatar_generic.png

diff --git a/app/assets/images/shared/avatar_generic.png b/app/assets/images/shared/avatar_generic.png
new file mode 100644
index 0000000000000000000000000000000000000000..6da187cb87c586de8e7da77f3aeec2c9a5b50a0c
GIT binary patch
literal 4133
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

literal 0
HcmV?d00001

diff --git a/app/assets/javascripts/accounts_profile_avatar.js b/app/assets/javascripts/accounts_profile_avatar.js
index b228af8e0..4cc75f3c4 100644
--- a/app/assets/javascripts/accounts_profile_avatar.js
+++ b/app/assets/javascripts/accounts_profile_avatar.js
@@ -74,13 +74,17 @@
             renderAvatarSpinner();
 
             rest.deleteAvatar()
-                .done(deleteAvatarSuccess)
+                .done(function() {
+                    removeAvatarSpinner({ delete:true });
+                    deleteAvatarSuccess(arguments);
+                })
                 .fail(function() {
                     app.ajaxError(arguments);
+                    $.cookie('original_fpfile', null);
                     self.updatingAvatar = false;
                 })
                 .always(function() {
-                    removeAvatarSpinner();
+
                 })
         }
 
@@ -161,8 +165,13 @@
             }
         }
 
-        function removeAvatarSpinner() {
+        function removeAvatarSpinner(options) {
             var avatarSpace = $('#account-profile-avatar-content-scroller .account-profile-avatar .avatar-space');
+
+            if(options && options.delete) {
+                avatarSpace.children().remove();
+            }
+
             var spinner = $('.spinner-large', avatarSpace);
             spinner.remove();
             var avatar = $('img.preview_profile_avatar', avatarSpace);
diff --git a/app/assets/javascripts/utils.js b/app/assets/javascripts/utils.js
index c578911cb..3c81ee985 100644
--- a/app/assets/javascripts/utils.js
+++ b/app/assets/javascripts/utils.js
@@ -40,7 +40,7 @@
     };
 
     context.JK.resolveAvatarUrl = function(photo_url) {
-        return photo_url ? photo_url : "/assets/shared/avatar_default.jpg";
+        return photo_url ? photo_url : "/assets/shared/avatar_generic.png";
     };
 
     context.JK.getInstrumentIconMap24 = function() {