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

update for desktop widgets

Browse Source
This commit is contained in:
Harry Bomrah authored and chris committed 2012-11-05 11:40:11 +08:00
1 parent 2e809c5c19
commit ca3e06c58b
37 files changed
+284 -179
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

config/application.rb
+1
View File
@@ -33,6 +33,7 @@ module Orbit
config.autoload_paths += %W(#{config.root}/app/models/meta)
config.autoload_paths += %W(#{config.root}/app/models/purchase)
config.autoload_paths += %W(#{config.root}/app/models/user)
config.autoload_paths += %W(#{config.root}/app/models/desktop)
# Include all helpers
# 'helper :all' must be removed in ApplicationController
config/routes.rb
+47 -36
View File
@@ -143,7 +143,17 @@ Orbit::Application.routes.draw do
resources :users
end
match '/desktop/'=>'desktop#index'
resources :desktop_widgets do
collection do
get 'upload'
get 'delete'
post 'upload'
end
end
namespace :desktop do
match "/"=>"desktop#index"
# Sinatra Routes start
@@ -178,46 +188,46 @@ Orbit::Application.routes.draw do
# Sinatra Routes end
match '/desktop/desktop'=>'desktop#desktop'
match '/desktop/app_manager'=>'desktop#app_manager'
match '/desktop/sections'=>'desktop#sections'
match '/desktop/settings'=>'desktop#settings'
match '/desktop/get_desktop_settings/'=>'desktop#get_desktop_settings'
match '/desktop/save_desktop_settings/'=>'desktop#save_desktop_settings'
match '/desktop/getgroups/'=>'desktop#getgroups'
match '/desktop/getsectionlist/'=>'desktop#getsectionlist'
match '/desktop/settingthemes/'=>'desktop#settingthemes'
match '/desktop/settingsections/'=>'desktop#settingsections'
match '/desktop/getapplist/'=>'desktop#getapplist'
match '/desktop/newpositions/'=>'desktop#newpositions'
match '/desktop/settingconnection/'=>'desktop#settingconnection'
match '/desktop'=>'desktop#desktop'
match '/app_manager'=>'desktop#app_manager'
match '/sections'=>'desktop#sections'
match '/settings'=>'desktop#settings'
match '/get_desktop_settings/'=>'desktop#get_desktop_settings'
match '/save_desktop_settings/'=>'desktop#save_desktop_settings'
match '/getgroups/'=>'desktop#getgroups'
match '/getsectionlist/'=>'desktop#getsectionlist'
match '/settingthemes/'=>'desktop#settingthemes'
match '/settingsections/'=>'desktop#settingsections'
match '/getapplist/'=>'desktop#getapplist'
match '/newpositions/'=>'desktop#newpositions'
match '/settingconnection/'=>'desktop#settingconnection'
match '/desktop/journal_p/'=>'desktop_publications#journal_p'
match '/desktop/journal_p_list/'=>'desktop_publications#journal_p_list'
match '/desktop/journal_p_add/'=>'desktop_publications#journal_p_add'
match '/desktop_publications/getjournals' => 'desktop_publications#getjournals'
match '/desktop/books' => 'desktop_publications#books'
match '/desktop/books_list/'=>'desktop_publications#books_list'
match '/desktop/books_add/'=>'desktop_publications#books_add'
match '/journal_p/'=>'desktop_publications#journal_p'
match '/journal_p_list/'=>'desktop_publications#journal_p_list'
match '/journal_p_add/'=>'desktop_publications#journal_p_add'
match '/books' => 'desktop_publications#books'
match '/books_list/'=>'desktop_publications#books_list'
match '/books_add/'=>'desktop_publications#books_add'
match '/desktop/seminar_p' => 'desktop_publications#seminar_p'
match '/desktop/seminar_p_list/'=>'desktop_publications#seminar_p_list'
match '/desktop/seminar_p_add/'=>'desktop_publications#seminar_p_add'
match '/seminar_p' => 'desktop_publications#seminar_p'
match '/seminar_p_list/'=>'desktop_publications#seminar_p_list'
match '/seminar_p_add/'=>'desktop_publications#seminar_p_add'
match '/desktop/research_d' => 'desktop_research#research_d'
match '/desktop/research_d_list/' => 'desktop_research#research_d_list'
match '/desktop/research_d_add' => 'desktop_research#research_d_add'
match '/research_d' => 'desktop_research#research_d'
match '/research_d_list/' => 'desktop_research#research_d_list'
match '/research_d_add' => 'desktop_research#research_d_add'
match '/desktop/research_p' => 'desktop_research#research_p'
match '/desktop/research_p_list/' => 'desktop_research#research_p_list'
match '/desktop/research_p_add' => 'desktop_research#research_p_add'
match '/research_p' => 'desktop_research#research_p'
match '/research_p_list/' => 'desktop_research#research_p_list'
match '/research_p_add' => 'desktop_research#research_p_add'
match '/temp_func/'=>'desktop#temp_func'
end
match '/desktop/twitter/'=>'otheraccounts#twitter'
match '/desktop/forgmail/'=>'otheraccounts#gmail'
match '/desktop/getaccounts'=>'otheraccounts#getaccounts'
match '/desktop/save_account_info/'=>'otheraccounts#saveaccountinfo'
match '/twitter/'=>'otheraccounts#twitter'
match '/forgmail/'=>'otheraccounts#gmail'
match '/getaccounts'=>'otheraccounts#getaccounts'
match '/save_account_info/'=>'otheraccounts#saveaccountinfo'
match '/desktop_appstore/appstore'=>'desktop_appstore#appstore'
match '/desktop_appstore/widgets'=>'desktop_appstore#widgets'
@@ -228,13 +238,14 @@ Orbit::Application.routes.draw do
match '/desktop_orbit/eventajaxload'=> 'desktop_orbit#eventajaxload'
match '/desktop_orbit/gettimelinespan' => 'desktop_orbit#gettimelinespan'
match '/desktop_publications/getjournals' => 'desktop_publications#getjournals'
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#create_journal'
#match '/desktop_orbit/eventajaxload' => 'desktop_publications#delete_journal'
# match '/desktop_orbit/eventajaxload' => 'desktop_publications#update_journal'
match '/desktop/temp_func/'=>'desktop#temp_func'
match '/panel/:app_name/front_end/:app_action/:id(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|
!request.query_string.include?("inner=true")