From 162fafaa204fbcfa71a7c495cbfbc4e68dc26997 Mon Sep 17 00:00:00 2001 From: Steve Gattuso Date: Sun, 23 Oct 2011 15:14:36 -0400 Subject: [PATCH 1/7] Adding a very simple favicon for my bookmarks bar. --- public/images/favicon.png | Bin 0 -> 1506 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/images/favicon.png diff --git a/public/images/favicon.png b/public/images/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..afaaf889097a47a68842cd5761664aedf8f3062e GIT binary patch literal 1506 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rIkMV3x~tb`J1#c2)=|%1_J8No8QD zU~CP!pM5z%pKTcrzf+GR}4O9?JiK}KQU6w@P04YHl8Q~ZV% zQ(n$q`&^(mcb25z#hR{r@|Lv)J@e{@B!Rx#qQchktv&e=X{IS~=;%>n(D`^nj5%7>4X2ih}x zI5qXjq-Z>t=){vaEBVN(A3kD|N?uDYWtN0gZnC&$tucApTN(F?lkt2z;>5m2Z`$$g z!S8u@Rj>E$5p6xXeesRJw_6)u?%E_gOS--^ap~f`hvqw<&X&$y&CL<`uj}bXkGRxR z{!M|`OU<552%i3@l>5BVly|CSLJ>T>)_jQjp_Rks-zt7+`u-~?&fQxpc)Fob$8Pn! z;Iqfxs9y59^g3n7{;sc1$0UAEFm#TZyHCY;PM77UTLIkaY~@X_pFN7vzs^2y_nFv- zzjku0)hkl&J0$+qwMOy7KI46M@!Rt|5|`iJcRA(tV#BD{yDv}NwP<72l>Xc5-)#F< z2}^F;xNl=!7>D+jMafxSn@ju|m{oKArhjIg{9dqyyQX8EZfF1Mr0@y;+FbcFdE%z? zc&_)jskgzp|1I;j;A^qZGUJOaKWi1dl>U48wVrt>Tb$&9i^Y243ye#jaBirH(|Ij= zTi#~g_J)bpx0Bb}<|gjywhLQ*yF@Qqj&V2t>Z|k5uey5o`ICC?ip77}Rw{E{JG3y~ z2$*3w3p^r=85p>QL70(Y)*J~22FAS1kcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+ zGdHy)QK2F?C$HG5!d3~a!V1U+3F|8h+i#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x!EwNQn0$BtH5O<~|!|f?3Ey@Agl9H^SnvVRe4>ugB*Cr*|s<<>MD>b~6SmU=KJYrt2dK+vsDew$TT<2+4&I?}J5w z{3&x z3u|H*UizG_GZ&q=5>oM$ zYE$H3imJHOJwGZ?By!qko9m^u_pNp@DqJ>Ubu5rcj}0&JW106{_jJ~*WvjGA>~tNU z?9y{%Sh=dp^vtYfqOO70zfQlfEq9WNMCT$8Zh>3dawXVon68}p|6k~M;f<41B@@bS fZ|mkuVA#)a>SOA*e3s{5L21j=)z4*}Q$iB}kQI3z literal 0 HcmV?d00001 From bdf74ab03e661bda3e0388b6e8425427d2423dd8 Mon Sep 17 00:00:00 2001 From: Steve Gattuso Date: Sun, 23 Oct 2011 16:22:23 -0400 Subject: [PATCH 2/7] Adding a checkbox for new_window --- app.rb | 16 +++++++++++++--- public/js/app.js | 3 +++ 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app.rb b/app.rb index 0bd8d8c..be2b295 100644 --- a/app.rb +++ b/app.rb @@ -304,7 +304,16 @@ H.li {H.b {"posted comments "}+posted_comments.to_s} } }+if $user and $user['id'].to_i == user['id'].to_i - H.br+H.form(:name=>"f") { + H.form(:name=>"f") { + H.label(:for => "new_window") { + "Open links in new window?" + }+if $user['new_window'] == '1' + H.checkbox(:name => "new_window", + :value => "1", :checked => "1") + else + H.checkbox(:name => "new_window", :value => 1) + end + + H.br + H.label(:for => "email") { "email (not visible, used for gravatar)" }+H.br+ @@ -482,12 +491,13 @@ post '/api/updateprofile' do return {:status => "err", :error => "Not authenticated."}.to_json if !$user - if !check_params(:about, :email) + if !check_params(:about, :email, :new_window) return {:status => "err", :error => "Missing parameters."}.to_json end $r.hmset("user:#{$user['id']}", "about", params[:about][0..4095], - "email", params[:email][0..255]) + "email", params[:email][0..255], + "new_window", (params[:new_window] == "1"?"1":"0")) return {:status => "ok"}.to_json end diff --git a/public/js/app.js b/public/js/app.js index adc2dc0..5601e03 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -48,9 +48,12 @@ function submit() { } function update_profile() { + var checked = '0' + if($('input[name=new_window]').is(':checked')) checked = '1'; var data = { email: $("input[name=email]").val(), about: $("textarea[name=about]").val(), + new_window: checked, apisecret: apisecret }; $.ajax({ From 7378a1323c5ad4627ab75f61b979ed774600c784 Mon Sep 17 00:00:00 2001 From: Steve Gattuso Date: Sun, 23 Oct 2011 16:26:20 -0400 Subject: [PATCH 3/7] Implementing target=_blank for new_window --- app.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app.rb b/app.rb index be2b295..792fefd 100644 --- a/app.rb +++ b/app.rb @@ -955,9 +955,15 @@ def news_to_html(news) "▲" }+" "+ H.h2 { - H.a(:href=>news["url"]) { - H.entities news["title"] - } + if $user['new_window'] == '1' + H.a(:href=>news['url'], :target=>'_blank') { + H.entities news['title'] + } + else + H.a(:href=>news["url"]) { + H.entities news["title"] + } + end }+" "+ H.address { if domain From 9f98045515808f00c88faa0b05c837ae34fc24b9 Mon Sep 17 00:00:00 2001 From: Steve Gattuso Date: Sun, 23 Oct 2011 16:27:45 -0400 Subject: [PATCH 4/7] Adding new_window field to documentation --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 738bfc6..b3b238e 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ A Redis hash named `user:` with the following fields: apisecret -> api POST requests secret code, to prevent CSRF attacks. flags -> flags used to mark users as admins and so forth karma_incr_time -> last time karma was incremented + new_window -> (1/0) Open news links in a new window? Additionally the user has an additional key: From 1ede3baecfb2d2134c215b0d7e2eaed419e35703 Mon Sep 17 00:00:00 2001 From: Steve Gattuso Date: Sun, 23 Oct 2011 16:55:11 -0400 Subject: [PATCH 5/7] Revert "Adding a very simple favicon for my bookmarks bar." This reverts commit 162fafaa204fbcfa71a7c495cbfbc4e68dc26997. --- public/images/favicon.png | Bin 1506 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 public/images/favicon.png diff --git a/public/images/favicon.png b/public/images/favicon.png deleted file mode 100644 index afaaf889097a47a68842cd5761664aedf8f3062e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1506 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rIkMV3x~tb`J1#c2)=|%1_J8No8QD zU~CP!pM5z%pKTcrzf+GR}4O9?JiK}KQU6w@P04YHl8Q~ZV% zQ(n$q`&^(mcb25z#hR{r@|Lv)J@e{@B!Rx#qQchktv&e=X{IS~=;%>n(D`^nj5%7>4X2ih}x zI5qXjq-Z>t=){vaEBVN(A3kD|N?uDYWtN0gZnC&$tucApTN(F?lkt2z;>5m2Z`$$g z!S8u@Rj>E$5p6xXeesRJw_6)u?%E_gOS--^ap~f`hvqw<&X&$y&CL<`uj}bXkGRxR z{!M|`OU<552%i3@l>5BVly|CSLJ>T>)_jQjp_Rks-zt7+`u-~?&fQxpc)Fob$8Pn! z;Iqfxs9y59^g3n7{;sc1$0UAEFm#TZyHCY;PM77UTLIkaY~@X_pFN7vzs^2y_nFv- zzjku0)hkl&J0$+qwMOy7KI46M@!Rt|5|`iJcRA(tV#BD{yDv}NwP<72l>Xc5-)#F< z2}^F;xNl=!7>D+jMafxSn@ju|m{oKArhjIg{9dqyyQX8EZfF1Mr0@y;+FbcFdE%z? zc&_)jskgzp|1I;j;A^qZGUJOaKWi1dl>U48wVrt>Tb$&9i^Y243ye#jaBirH(|Ij= zTi#~g_J)bpx0Bb}<|gjywhLQ*yF@Qqj&V2t>Z|k5uey5o`ICC?ip77}Rw{E{JG3y~ z2$*3w3p^r=85p>QL70(Y)*J~22FAS1kcg59UmvUF{9L`nl>DSry^7odplSvNn+hu+ zGdHy)QK2F?C$HG5!d3~a!V1U+3F|8h+i#(Mch>H3D2mX`VkM*2oZx=P7{9O-#x!EwNQn0$BtH5O<~|!|f?3Ey@Agl9H^SnvVRe4>ugB*Cr*|s<<>MD>b~6SmU=KJYrt2dK+vsDew$TT<2+4&I?}J5w z{3&x z3u|H*UizG_GZ&q=5>oM$ zYE$H3imJHOJwGZ?By!qko9m^u_pNp@DqJ>Ubu5rcj}0&JW106{_jJ~*WvjGA>~tNU z?9y{%Sh=dp^vtYfqOO70zfQlfEq9WNMCT$8Zh>3dawXVon68}p|6k~M;f<41B@@bS fZ|mkuVA#)a>SOA*e3s{5L21j=)z4*}Q$iB}kQI3z From 60351bc9f2232b74d7580a54095daa8865a98a99 Mon Sep 17 00:00:00 2001 From: Steve Gattuso Date: Sun, 23 Oct 2011 17:09:11 -0400 Subject: [PATCH 6/7] Fixing tabs/spaces issue. --- README.md | 2 +- app.rb | 40 ++++++++++++++++++++-------------------- public/js/app.js | 8 ++++---- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index b3b238e..f1e9a65 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ A Redis hash named `user:` with the following fields: apisecret -> api POST requests secret code, to prevent CSRF attacks. flags -> flags used to mark users as admins and so forth karma_incr_time -> last time karma was incremented - new_window -> (1/0) Open news links in a new window? + new_window -> (1/0) Open news links in a new window? Additionally the user has an additional key: diff --git a/app.rb b/app.rb index 792fefd..1178254 100644 --- a/app.rb +++ b/app.rb @@ -304,16 +304,16 @@ H.li {H.b {"posted comments "}+posted_comments.to_s} } }+if $user and $user['id'].to_i == user['id'].to_i - H.form(:name=>"f") { - H.label(:for => "new_window") { - "Open links in new window?" - }+if $user['new_window'] == '1' - H.checkbox(:name => "new_window", - :value => "1", :checked => "1") - else - H.checkbox(:name => "new_window", :value => 1) - end + - H.br + + H.form(:name=>"f") { + H.label(:for => "new_window") { + "Open links in new window?" + }+if $user['new_window'] == '1' + H.checkbox(:name => "new_window", + :value => "1", :checked => "1") + else + H.checkbox(:name => "new_window", :value => 1) + end + + H.br + H.label(:for => "email") { "email (not visible, used for gravatar)" }+H.br+ @@ -497,7 +497,7 @@ $r.hmset("user:#{$user['id']}", "about", params[:about][0..4095], "email", params[:email][0..255], - "new_window", (params[:new_window] == "1"?"1":"0")) + "new_window", (params[:new_window] == "1" ? "1" : "0")) return {:status => "ok"}.to_json end @@ -955,15 +955,15 @@ def news_to_html(news) "▲" }+" "+ H.h2 { - if $user['new_window'] == '1' - H.a(:href=>news['url'], :target=>'_blank') { - H.entities news['title'] - } - else - H.a(:href=>news["url"]) { - H.entities news["title"] - } - end + if $user['new_window'] == '1' + H.a(:href=>news['url'], :target=>'_blank') { + H.entities news['title'] + } + else + H.a(:href=>news["url"]) { + H.entities news["title"] + } + end }+" "+ H.address { if domain diff --git a/public/js/app.js b/public/js/app.js index 5601e03..2de20ed 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -48,12 +48,12 @@ function submit() { } function update_profile() { - var checked = '0' - if($('input[name=new_window]').is(':checked')) checked = '1'; + var checked = '0'; + if($('input[name=new_window]').is(':checked')) checked = '1'; var data = { email: $("input[name=email]").val(), - about: $("textarea[name=about]").val(), - new_window: checked, + about: $("textarea[name=about]").val(), + new_window: checked, apisecret: apisecret }; $.ajax({ From 2041332a8ed29a27bfeafb45ea7b8cdf9eecc587 Mon Sep 17 00:00:00 2001 From: Steve Gattuso Date: Sun, 23 Oct 2011 19:45:25 -0400 Subject: [PATCH 7/7] Fixing inconsistant code formatting. --- public/js/app.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/js/app.js b/public/js/app.js index 2de20ed..0012e04 100644 --- a/public/js/app.js +++ b/public/js/app.js @@ -48,8 +48,10 @@ function submit() { } function update_profile() { - var checked = '0'; - if($('input[name=new_window]').is(':checked')) checked = '1'; + var checked = "0"; + if($("input[name=new_window]").is(":checked")) { + checked = "1"; + } var data = { email: $("input[name=email]").val(), about: $("textarea[name=about]").val(),