From 6c3f4bff8cb42beb5b154412641b13a404def4ef Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 26 Dec 2013 17:41:05 +0800 Subject: [PATCH] new stuff for gmail and fb --- app/assets/images/connection/Thumbs.db | Bin 0 -> 6144 bytes app/assets/images/connection/facebook.png | Bin 0 -> 820 bytes app/assets/images/connection/gmail.png | Bin 0 -> 2408 bytes app/assets/images/connection/twitter.png | Bin 0 -> 1475 bytes .../javascripts/desktop/orbitdesktop.js | 109 +++++++++--------- app/controllers/desktop_controller.rb | 3 +- app/controllers/otheraccounts_controller.rb | 13 ++- .../desktop/settings/connections.html.erb | 15 +-- app/views/desktop/settings/themes.html.erb | 2 +- config/routes.rb | 2 +- 10 files changed, 74 insertions(+), 70 deletions(-) create mode 100755 app/assets/images/connection/Thumbs.db create mode 100755 app/assets/images/connection/facebook.png create mode 100755 app/assets/images/connection/gmail.png create mode 100755 app/assets/images/connection/twitter.png diff --git a/app/assets/images/connection/Thumbs.db b/app/assets/images/connection/Thumbs.db new file mode 100755 index 0000000000000000000000000000000000000000..47897e3f3bc28bd197373d4b4c5e43a4ea03dd0a GIT binary patch literal 6144 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 ZTH}ujnuyEszh0jIc+vi4{g;Wr-vII$sH^}0 literal 0 HcmV?d00001 diff --git a/app/assets/images/connection/facebook.png b/app/assets/images/connection/facebook.png new file mode 100755 index 0000000000000000000000000000000000000000..f8c4f2190fee49b804e9d61aff25a4bd65a21c9e GIT binary patch literal 820 zcmV-41Izr0P)X)>i_@( zib+I4RA_uwg@uKPiorq=5;%gwhRf~cV=R_EFSqN?yN)+IJ3CLau=~#JJUe^u%+Bty ztFsFn3}7&w&~T^(rblo}=8K`c8=x91Y&xYAcJgk32+p&`GeH*CR=8Jm>iiirCdYBS z?&6o<#>Thp#4=k=ADc}-Ra!gYNYtxUFni-N?%tXrmt9)^h{w;?Qe(6dj$|8?V|f1X zcINVL-~SNCXp^*LWdUHP)e**MBMbniPuBlgmWmd_QSUyPzd7)8X(0@RnRsH{8~Ay& z5x#T%l9Kailcg`7n;^ycI{{w4`Or7kGI+HLwwk`Myf(teJXaX=;OPopuYO65DeO$E zpY5NmuB=EZ4Q+nIB7DLaOQA5rQLoDME>Ixh|AiGco!o`9KHz7K??>sdB-7Z|?jE_G zw8X|{<`yKc86D1nwHNmXR{yJ&&v>-B`WNBo&4WR#zxytXF-o{_3jivx!lq-CFy(pJ zDB(>V7XW7F78Cc2#^+C8o47Z>B&=Vn1%RZ+P-kDY(UH`8sN{Z2XKlQF9?pmrHXSQ$ zI#$?ptgvcwUBr{EY>*rt{%M@dr%bWA^tI^*g3bY;NS=dZx4kEft9w;kxo{Sv)e$ht zC%_DFE5le`-#D^6CLDAQ&<^&M3R8%BxE<`1g_DR0bI!pzS0+q{cQ@3F#1roQ+>@4S ztgz{nPB@md7-L|v%L*Cbpe9Jx-B7c1l1EI~tqeykQ37=wK6Ro70I0f7rg1p7yZ7y( y&ND3;!j29vk`q5*HclD-lh#XNK1`D*?AYJSey%!KFX(�X)>i_@< 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 will be binded with language, data-lang = string ex "en"|"zh_tw" will toggle all data-langunage throughout the page //enableSharing( dom ) children will be binded with share, data-mode = string ex "public"|"private" will change the mode for all the selected items. the dom with class should have data-link = url data-var = vaiable_name, default will be mode - $.extend($.expr[':'], { 'containsi': function (elem, i, match, array) { return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0; @@ -1349,50 +1348,52 @@ var orbitDesktop = function(dom){ this.initializeSettings.connection = function(){ var bindHandlers = function(){ - $("#connection_setting ul a").click(function(){ + $("#connection_setting ul div.s_action a").click(function(){ var what = $(this).attr("for"), - type = $(this).attr("href"), - $ul = $("#"+type+"_connection"), - usernm = $ul.find("input[type=text]").val(), - pwd = $ul.find("input[type=password]").val(); - switch(what){ - case "save": - case "new": - if(usernm!="" && pwd!=""){ - $ul.find("input[type=text]").replaceWith("
"+usernm+"
") - $ul.find("input[type=password]").replaceWith("
••••••
"); - $(this).text("Edit").attr("for","edit"); - $(this).parent().find("a[for=delete]").show(); - $ul.find("span.c_status").text("Connected").addClass("c_status_on"); - if(what=="save") - what="edit"; - saveaccount(usernm,pwd,type,what); - } - break; - case "edit": - var un = $ul.find("div.usrnm").text(); - $ul.find("div.usrnm").replaceWith(''); - $ul.find("div.pwd").replaceWith(''); - $(this).text("Save").attr("for","save"); - break; - case "delete": - var $this = $(this); - o.confirm({ - message : "Are you sure that you want to remove this account?", - buttons : ["Yes","No"], - highlighted : 2 - },function(reply){ - if(reply){ - $this.hide(); - $ul.find("div.usrnm").replaceWith(''); - $ul.find("div.pwd").replaceWith(''); - $ul.find("span.c_status").text("No Connection").removeClass("c_status_on"); - $this.parent().find("a[for=edit]").text("Connect").attr("for","new"); - saveaccount("","",type,what); + type = $(this).attr("href"), + $ul = $("#"+type+"_connection"), + usernm = $ul.find("input[type=text]").val(), + pwd = $ul.find("input[type=password]").val(); + + switch(what){ + case "save": + case "new": + if(usernm!="" && pwd!=""){ + $ul.find("input[type=text]").replaceWith("
"+usernm+"
") + $ul.find("input[type=password]").replaceWith("
••••••
"); + $(this).text("Edit").attr("for","edit"); + $(this).parent().find("a[for=delete]").show(); + $ul.find("span.c_status").text("Connected").addClass("c_status_on"); + if(what=="save") + what="edit"; + saveaccount(usernm,pwd,type,what); + } - }) - break; - } + break; + case "edit": + var un = $ul.find("div.usrnm").text(); + $ul.find("div.usrnm").replaceWith(''); + $ul.find("div.pwd").replaceWith(''); + $(this).text("Save").attr("for","save"); + break; + case "delete": + var $this = $(this); + o.confirm({ + message : "Are you sure that you want to remove this account?", + buttons : ["Yes","No"], + highlighted : 2 + },function(reply){ + if(reply){ + $this.hide(); + $ul.find("div.usrnm").replaceWith(''); + $ul.find("div.pwd").replaceWith(''); + $ul.find("span.c_status").text("No Connection").removeClass("c_status_on"); + $this.parent().find("a[for=edit]").text("Connect").attr("for","new"); + saveaccount("","",type,what); + } + }) + break; + } }) var $conlist = $('.s_form'), @@ -1418,17 +1419,17 @@ var orbitDesktop = function(dom){ }) } - // $.getJSON("/otheraccounts/getaccounts",function(accounts){ - // $.each(accounts,function(i,account){ - // $ul = $("#"+account.type+"_connection"); - // $ul.find("input[type=text]").replaceWith("
"+account.email+"
") - // $ul.find("input[type=password]").replaceWith("
••••••
"); - // $ul.find("a[for=new]").text("Edit").attr("for","edit"); - // $ul.find("a[for=delete]").show(); - // $ul.find(".c_status").text("Connected").addClass("c_status_on"); - // }) - // bindHandlers(); - // }) + $.getJSON("/otheraccounts/getaccounts",function(accounts){ + $.each(accounts,function(i,account){ + $ul = $("#"+account.type+"_connection"); + $ul.find("input[type=text]").replaceWith("
"+account.email+"
") + $ul.find("input[type=password]").replaceWith("
••••••
"); + $ul.find("a[for=new]").text("Edit").attr("for","edit"); + $ul.find("a[for=delete]").show(); + $ul.find(".c_status").text("Connected").addClass("c_status_on"); + }) + bindHandlers(); + }) } diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 79c9f926..4e301dc9 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -52,7 +52,8 @@ class DesktopController< ApplicationController end def connections - @url = "http://fb.tp.rulingcom.com/login?callback=http://harry.tp.rulingcom.com/facebook/register_fb?user="+current_user.id.to_s + # @url = "http://fb.tp.rulingcom.com/login?callback=http://harry.tp.rulingcom.com/facebook/register_fb?user="+current_user.id.to_s + @user_id = current_user.id.to_s render "desktop/settings/connections", :layout => false end diff --git a/app/controllers/otheraccounts_controller.rb b/app/controllers/otheraccounts_controller.rb index d946bd3c..ee4e9b9f 100644 --- a/app/controllers/otheraccounts_controller.rb +++ b/app/controllers/otheraccounts_controller.rb @@ -1,4 +1,4 @@ -class Desktop::OtheraccountsController< ApplicationController +class OtheraccountsController < ApplicationController require 'open-uri' require 'rexml/document' require 'net/http' @@ -11,12 +11,13 @@ class Desktop::OtheraccountsController< ApplicationController @email = params['email'] @password = params['password'] @account = params['account'] + case @dowhat when "new" OtherAccount.create(user_id: current_user.id, email: @email, encrypted_password: @password, type: @account) when "edit" - @otheraccount = OtherAccount.where(:type.all => [@account],:user_id.all => [current_user.id]) rescue nil - @otheraccount.first.update_attributes(:email => @email, :encrypted_password => @password) + @otheraccount = current_user.other_accounts.where(:type => @account).first rescue nil + @otheraccount.update_attributes(:email => @email, :encrypted_password => @password) when "delete" @otheraccount = OtherAccount.where(:type.all => [@account], :user_id.all => [current_user.id]) rescue nil @otheraccount.destroy_all @@ -27,7 +28,7 @@ class Desktop::OtheraccountsController< ApplicationController end def gmail - @gmailaccount = OtherAccount.where(:type.all => ["gmail"],:user_id.all => [current_user.id]) rescue nil + @gmailaccount = current_user.other_accounts.where(:type => "gmail") rescue nil if @gmailaccount.first != nil @decrypted_password = @gmailaccount.first.encrypted_password.decrypt @email = @gmailaccount.first.email @@ -44,7 +45,7 @@ class Desktop::OtheraccountsController< ApplicationController root = Document.new(response.read_body).root render :text=>root else - msg = "trueAccount setting problem." + msg = "Unauthorized

No account connected.

" respond_to do |m| m.xml {render :xml=>msg} end @@ -72,7 +73,7 @@ class Desktop::OtheraccountsController< ApplicationController end def getaccounts - @accounts = OtherAccount.where(:user_id.all => [current_user.id]).without(:encrypted_password) + @accounts = current_user.other_accounts.without(:encrypted_password) render :json => @accounts.to_json end end \ No newline at end of file diff --git a/app/views/desktop/settings/connections.html.erb b/app/views/desktop/settings/connections.html.erb index 57b186d1..da543b3c 100644 --- a/app/views/desktop/settings/connections.html.erb +++ b/app/views/desktop/settings/connections.html.erb @@ -1,11 +1,11 @@ -
- Connect FaceBook +
+ +
    + +
  • No Connection
    • @@ -39,7 +40,7 @@
- --> +
diff --git a/app/views/desktop/settings/themes.html.erb b/app/views/desktop/settings/themes.html.erb index 9960d374..836ccec9 100644 --- a/app/views/desktop/settings/themes.html.erb +++ b/app/views/desktop/settings/themes.html.erb @@ -7,7 +7,7 @@ -
+
<% @themes.each do |theme| %> diff --git a/config/routes.rb b/config/routes.rb index f8174291..69430665 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -317,7 +317,7 @@ Orbit::Application.routes.draw do match '/twitter/'=>'otheraccounts#twitter' match '/forgmail/'=>'otheraccounts#gmail' match '/otheraccounts/getaccounts'=>'otheraccounts#getaccounts' - match '/save_account_info/'=>'otheraccounts#saveaccountinfo' + match '/desktop/save_account_info/'=>'otheraccounts#saveaccountinfo' match '/desktop_appstore/appstore'=>'desktop_appstore#appstore' match '/desktop_appstore/onlinestore'=>'desktop_appstore#onlinestore'