developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

new stuff for gmail and fb

This commit is contained in:
Harry Bomrah 2013-12-26 17:41:05 +08:00 committed by saurabhbhatia
parent 270559f340
commit 6c3f4bff8c
10 changed files with 74 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/assets/images/connection/Thumbs.db Executable file
View File

Binary file not shown.

BIN
app/assets/images/connection/facebook.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 820 B

BIN
app/assets/images/connection/gmail.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
app/assets/images/connection/twitter.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

27
app/assets/javascripts/desktop/orbitdesktop.js
View File

@ -32,7 +32,6 @@
//enableLanguageSelect( dom ) children <a> will be binded with language, data-lang = string ex "en"|"zh_tw" will toggle all data-langunage throughout the page //enableLanguageSelect( dom ) children <a> will be binded with language, data-lang = string ex "en"|"zh_tw" will toggle all data-langunage throughout the page
//enableSharing( dom ) children <a> 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 //enableSharing( dom ) children <a> 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[':'], { $.extend($.expr[':'], {
'containsi': function (elem, i, match, array) { 'containsi': function (elem, i, match, array) {
return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0; return (elem.textContent || elem.innerText || '').toLowerCase().indexOf((match[3] || "").toLowerCase()) >= 0;
@ -1349,12 +1348,13 @@ var orbitDesktop = function(dom){
this.initializeSettings.connection = function(){ this.initializeSettings.connection = function(){
var bindHandlers = function(){ var bindHandlers = function(){
$("#connection_setting ul a").click(function(){ $("#connection_setting ul div.s_action a").click(function(){
var what = $(this).attr("for"), var what = $(this).attr("for"),
type = $(this).attr("href"), type = $(this).attr("href"),
$ul = $("#"+type+"_connection"), $ul = $("#"+type+"_connection"),
usernm = $ul.find("input[type=text]").val(), usernm = $ul.find("input[type=text]").val(),
pwd = $ul.find("input[type=password]").val(); pwd = $ul.find("input[type=password]").val();
switch(what){ switch(what){
case "save": case "save":
case "new": case "new":
@ -1367,6 +1367,7 @@ var orbitDesktop = function(dom){
if(what=="save") if(what=="save")
what="edit"; what="edit";
saveaccount(usernm,pwd,type,what); saveaccount(usernm,pwd,type,what);
} }
break; break;
case "edit": case "edit":
@ -1418,17 +1419,17 @@ var orbitDesktop = function(dom){
}) })
} }
// $.getJSON("/otheraccounts/getaccounts",function(accounts){ $.getJSON("/otheraccounts/getaccounts",function(accounts){
// $.each(accounts,function(i,account){ $.each(accounts,function(i,account){
// $ul = $("#"+account.type+"_connection"); $ul = $("#"+account.type+"_connection");
// $ul.find("input[type=text]").replaceWith("<div class='c_info usrnm'>"+account.email+"</div>") $ul.find("input[type=text]").replaceWith("<div class='c_info usrnm'>"+account.email+"</div>")
// $ul.find("input[type=password]").replaceWith("<div class='c_info pwd'>&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;</div>"); $ul.find("input[type=password]").replaceWith("<div class='c_info pwd'>&#8226;&#8226;&#8226;&#8226;&#8226;&#8226;</div>");
// $ul.find("a[for=new]").text("Edit").attr("for","edit"); $ul.find("a[for=new]").text("Edit").attr("for","edit");
// $ul.find("a[for=delete]").show(); $ul.find("a[for=delete]").show();
// $ul.find(".c_status").text("Connected").addClass("c_status_on"); $ul.find(".c_status").text("Connected").addClass("c_status_on");
// }) })
// bindHandlers(); bindHandlers();
// }) })
} }

3
app/controllers/desktop_controller.rb
View File

@ -52,7 +52,8 @@ class DesktopController< ApplicationController
end end
def connections 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 render "desktop/settings/connections", :layout => false
end end

13
app/controllers/otheraccounts_controller.rb
View File

@ -1,4 +1,4 @@
class Desktop::OtheraccountsController< ApplicationController class OtheraccountsController < ApplicationController
require 'open-uri' require 'open-uri'
require 'rexml/document' require 'rexml/document'
require 'net/http' require 'net/http'
@ -11,12 +11,13 @@ class Desktop::OtheraccountsController< ApplicationController
@email = params['email'] @email = params['email']
@password = params['password'] @password = params['password']
@account = params['account'] @account = params['account']
case @dowhat case @dowhat
when "new" when "new"
OtherAccount.create(user_id: current_user.id, email: @email, encrypted_password: @password, type: @account) OtherAccount.create(user_id: current_user.id, email: @email, encrypted_password: @password, type: @account)
when "edit" when "edit"
@otheraccount = OtherAccount.where(:type.all => [@account],:user_id.all => [current_user.id]) rescue nil @otheraccount = current_user.other_accounts.where(:type => @account).first rescue nil
@otheraccount.first.update_attributes(:email => @email, :encrypted_password => @password) @otheraccount.update_attributes(:email => @email, :encrypted_password => @password)
when "delete" when "delete"
@otheraccount = OtherAccount.where(:type.all => [@account], :user_id.all => [current_user.id]) rescue nil @otheraccount = OtherAccount.where(:type.all => [@account], :user_id.all => [current_user.id]) rescue nil
@otheraccount.destroy_all @otheraccount.destroy_all
@ -27,7 +28,7 @@ class Desktop::OtheraccountsController< ApplicationController
end end
def gmail 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 if @gmailaccount.first != nil
@decrypted_password = @gmailaccount.first.encrypted_password.decrypt @decrypted_password = @gmailaccount.first.encrypted_password.decrypt
@email = @gmailaccount.first.email @email = @gmailaccount.first.email
@ -44,7 +45,7 @@ class Desktop::OtheraccountsController< ApplicationController
root = Document.new(response.read_body).root root = Document.new(response.read_body).root
render :text=>root render :text=>root
else else
msg = "<HEAD><ERROR>true</ERROR><ERRORMSG>Account setting problem.</ERRORMSG></HEAD>" msg = "<HEAD><TITLE>Unauthorized</TITLE><H1>No account connected.</H1></HEAD>"
respond_to do |m| respond_to do |m|
m.xml {render :xml=>msg} m.xml {render :xml=>msg}
end end
@ -72,7 +73,7 @@ class Desktop::OtheraccountsController< ApplicationController
end end
def getaccounts 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 render :json => @accounts.to_json
end end
end end

15
app/views/desktop/settings/connections.html.erb
View File

@ -1,11 +1,11 @@
<div id="connection_setting" class="overview vp" content-layout="simple"> <div id="connection_setting" class="overview vp" content-layout="simple" isotope="true">
<a href="" onclick="window.open('<%= facebook_server_path %>','login_window','height=250,width=400,titlebar=0,statusbar=0,location=0');return false;">Connect FaceBook</a> <!-- <a href="" onclick="window.open('<%= facebook_server_path %>','login_window','height=250,width=400,titlebar=0,statusbar=0,location=0');return false;">Connect FaceBook</a>
<a href="/facebook/get_friends" ajax-remote="get" >Get Friends</a> <a href="/facebook/get_friends" ajax-remote="get" >Get Friends</a>
<a href="/facebook/disconnect" ajax-remote="get" >Disconnect from facebook</a> <a href="/facebook/disconnect" ajax-remote="get" >Disconnect from facebook</a> -->
<!-- <ul class="s_form w2 hp" id="facebook_connection"> <ul class="s_form w2 hp" id="facebook_connection" >
<li><span class="c_status">No Connection</span></li> <!-- <li><span class="c_status">No Connection</span></li>
<li><img src="/assets/connection/facebook.png" alt="" class="c_icon"><h1 class="c_name">Facebook</h1></li> <li><img src="/assets/connection/facebook.png" alt="" class="c_icon"><h1 class="c_name">Facebook</h1></li>
<li><label for="">Account</label><input type="text"></li> <li><label for="">Account</label><input type="text"></li>
<li><label for="">Password</label><input type="password"></li> <li><label for="">Password</label><input type="password"></li>
@ -14,7 +14,8 @@
<a href="facebook" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="new">Connect</a> <a href="facebook" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="new">Connect</a>
<a href="facebook" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="delete" style="display:none;">Remove</a> <a href="facebook" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="delete" style="display:none;">Remove</a>
</div> </div>
</li> </li> -->
<li><a href="javascript:void(0);" onclick="window.open('<%= facebook_server_path(:user_id=>@user_id) %>','login_window','height=668,width=1124,titlebar=0,statusbar=0,location=0');"><img src="/assets/facebook-logo.png" alt="" class="c_icon"></a></li>
</ul> </ul>
<ul class="s_form w2 hp" id="twitter_connection"> <ul class="s_form w2 hp" id="twitter_connection">
<li><span class="c_status">No Connection</span></li> <li><span class="c_status">No Connection</span></li>
@ -39,7 +40,7 @@
<a href="gmail" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="delete" style="display:none;">Remove</a> <a href="gmail" class="setting_btn thmc1 thmtxt hp" onclick="return false;" for="delete" style="display:none;">Remove</a>
</div> </div>
</li> </li>
</ul> --> </ul>
</div> </div>
<!-- <div style="z-index:999;position:relative;"><button onclick="o.tempFunc()">Twitter</button> --> <!-- <div style="z-index:999;position:relative;"><button onclick="o.tempFunc()">Twitter</button> -->

2
app/views/desktop/settings/themes.html.erb
View File

@ -7,7 +7,7 @@
</ul> </ul>
</div> </div>
<div class="overview tab_holder" content-layout="simple"> <div class="overview tab_holder" content-layout="simple" base-width="300">
<div id="st1" class="st_c" style="display:block;"> <div id="st1" class="st_c" style="display:block;">
<div class="theme_list ssl"> <div class="theme_list ssl">
<% @themes.each do |theme| %> <% @themes.each do |theme| %>

2
config/routes.rb
View File

@ -317,7 +317,7 @@ Orbit::Application.routes.draw do
match '/twitter/'=>'otheraccounts#twitter' match '/twitter/'=>'otheraccounts#twitter'
match '/forgmail/'=>'otheraccounts#gmail' match '/forgmail/'=>'otheraccounts#gmail'
match '/otheraccounts/getaccounts'=>'otheraccounts#getaccounts' 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/appstore'=>'desktop_appstore#appstore'
match '/desktop_appstore/onlinestore'=>'desktop_appstore#onlinestore' match '/desktop_appstore/onlinestore'=>'desktop_appstore#onlinestore'