From c158375d021ac3c8dadef761fcee276a8dd76874 Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Thu, 26 Apr 2012 21:30:13 +0800 Subject: [PATCH] =?UTF-8?q?with=20connection=20and=20some=20save=20setting?= =?UTF-8?q?s=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/assets/images/facebook.png | Bin 0 -> 7120 bytes app/assets/images/gmail.png | Bin 0 -> 8019 bytes app/assets/images/linkedin.png | Bin 0 -> 5732 bytes app/assets/images/twitter.png | Bin 0 -> 3794 bytes app/assets/javascripts/orbitdesktop.js | 14 +++++++ app/controllers/desktop_controller.rb | 4 ++ app/controllers/otheraccounts_controller.rb | 7 ++++ app/models/other_accounts.rb | 15 ++++++++ app/models/user/user.rb | 1 + app/views/desktop/settings.html.erb | 2 +- .../desktop/settings/connections.html.erb | 35 ++++++++++++++++++ config/routes.rb | 3 ++ public/desktop_widgets/gmail/gmail.js | 10 +++++ 13 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 app/assets/images/facebook.png create mode 100644 app/assets/images/gmail.png create mode 100644 app/assets/images/linkedin.png create mode 100644 app/assets/images/twitter.png create mode 100644 app/models/other_accounts.rb create mode 100644 app/views/desktop/settings/connections.html.erb diff --git a/app/assets/images/facebook.png b/app/assets/images/facebook.png new file mode 100644 index 0000000000000000000000000000000000000000..3bfe4bac2c05108df248a2a270174fb3d61c863e GIT binary patch literal 7120 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 literal 0 HcmV?d00001 diff --git a/app/assets/images/gmail.png b/app/assets/images/gmail.png new file mode 100644 index 0000000000000000000000000000000000000000..dd2d70a82a379eb92ed8d15b4267a03511f50bb4 GIT binary patch literal 8019 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 IM6N<$g1ICTo&W#< literal 0 HcmV?d00001 diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index ead5741f7..33aab4fcd 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -481,6 +481,9 @@ var orbitDesktop = function(dom){ case "sections": sections(); break; + case "connection": + connection(); + break; } $("div#settings ul#setting_left_nav li a").removeClass('thmc1 thmtxt').data('clicked',null); $(this).addClass('thmc1 thmtxt').data('clicked',true); @@ -684,6 +687,7 @@ var orbitDesktop = function(dom){ $(this).miniColors("value", o.rgb2hex(color)); }); } + $("div#settings div#panel_r").load("/desktop/settingthemes",function(){ $.getJSON("/desktop/get_desktop_settings",{"get":"theme","desktopid":o.desktopId},function(theme){ $('#st1 .theme_list [id='+theme+']') @@ -696,6 +700,16 @@ var orbitDesktop = function(dom){ }) }) } + + var connection = function(){ + var bindHandlers = function(){ + + } + $("div#settings div#panel_r").load("/desktop/settingconnection",function(){ + bindHandlers(); + }) + + } $(o.contentHolder).empty().load("/desktop/"+target,function(){ bindHandlers(); diff --git a/app/controllers/desktop_controller.rb b/app/controllers/desktop_controller.rb index 8a9670bed..0123aa87e 100644 --- a/app/controllers/desktop_controller.rb +++ b/app/controllers/desktop_controller.rb @@ -38,6 +38,10 @@ class DesktopController< ApplicationController render "desktop/settings/sections", :layout => false end + def settingconnection + render "desktop/settings/connections", :layout => false + end + def journal_p render :layout => false end diff --git a/app/controllers/otheraccounts_controller.rb b/app/controllers/otheraccounts_controller.rb index 96c4787cf..f5051cb8b 100644 --- a/app/controllers/otheraccounts_controller.rb +++ b/app/controllers/otheraccounts_controller.rb @@ -5,6 +5,13 @@ class OtheraccountsController< ApplicationController require 'net/https' include REXML + def saveaccountinfo + @email = params['email'] + @password = params['password'] + @account = params['account'] + OtherAccount.new(email: @email, encrypted_password: @password, type: @account) + end + def gmail url = URI.parse("https://mail.google.com/mail/feed/atom") req = Net::HTTP::Get.new(url.path) diff --git a/app/models/other_accounts.rb b/app/models/other_accounts.rb new file mode 100644 index 000000000..b702974fb --- /dev/null +++ b/app/models/other_accounts.rb @@ -0,0 +1,15 @@ +class OtherAccount + include Mongoid::Document + include Mongoid::Timestamps + + field :type + field :email + field :encrypted_password + + attr_encrypted :encrypted_password, :key => 'rulingorbit.com', :encode => true + + belongs_to :user + + + +end \ No newline at end of file diff --git a/app/models/user/user.rb b/app/models/user/user.rb index 39fec3f0c..84f556c2c 100644 --- a/app/models/user/user.rb +++ b/app/models/user/user.rb @@ -17,6 +17,7 @@ class User has_many :managing_apps,:class_name => "AppManager" has_one :desktop, :autosave => true, :dependent => :destroy + has_many :otheraccount, :autosave => true, :dependent => :destroy belongs_to :role has_and_belongs_to_many :sub_roles accepts_nested_attributes_for :attribute_values, :allow_destroy => true diff --git a/app/views/desktop/settings.html.erb b/app/views/desktop/settings.html.erb index df41ef601..8b7ad2d1f 100644 --- a/app/views/desktop/settings.html.erb +++ b/app/views/desktop/settings.html.erb @@ -14,7 +14,7 @@
  • Account
  • Sections
  • Theme
  • -
  • Connection
  • +
  • Connection
  • diff --git a/app/views/desktop/settings/connections.html.erb b/app/views/desktop/settings/connections.html.erb new file mode 100644 index 000000000..cac2acd75 --- /dev/null +++ b/app/views/desktop/settings/connections.html.erb @@ -0,0 +1,35 @@ + +
    +
    +
    +
    +
    Connections
    + + + + + + + + + + + + + + + + + + + + + + +
    +
    + Save +
    +
    +
    +
    diff --git a/config/routes.rb b/config/routes.rb index 0c793d327..8c9b3d756 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -117,7 +117,10 @@ Orbit::Application.routes.draw do match '/desktop/journal_p/'=>'desktop#journal_p' match '/desktop/journal_p_list/'=>'desktop#journal_p_list' match '/desktop/journal_p_add/'=>'desktop#journal_p_add' + match '/desktop/settingconnection/'=>'desktop#settingconnection' match '/desktop/forgmail/'=>'otheraccounts#gmail' + match '/desktop/save_account_info/'=>'otheraccounts#saveaccountinfo' + match '/desktop/temp_func/'=>'desktop#temp_func' match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request| diff --git a/public/desktop_widgets/gmail/gmail.js b/public/desktop_widgets/gmail/gmail.js index e51640a15..3a267e746 100644 --- a/public/desktop_widgets/gmail/gmail.js +++ b/public/desktop_widgets/gmail/gmail.js @@ -42,4 +42,14 @@ var gmail = function(){ } }); } +} + +var saveaccount = function(){ + var usernm = $("#gmail input[type=text]").val(); + var pwd = $("#gmail input[type=password]").val(); + usernm = "hr@rulingcom.com"; + pwd = "hr08973"; + if(usernm!="" && pwd!=""){ + $.post("/desktop/save_account_info",{email:usernm,password:pwd,account:"gmail"}) + } } \ No newline at end of file