Merge branch 'desktop_harry' of github.com:Rulingcom/orbit into desktop_harry

Conflicts:
	Gemfile.lock
	app/assets/javascripts/.DS_Store
	app/assets/stylesheets/style.css.erb
	app/views/layouts/_orbit_bar.html.erb

config/application.rb

@@ -35,6 +35,7 @@ module Orbit
     config.autoload_paths += %W(#{config.root}/app/models/purchase)
     config.autoload_paths += %W(#{config.root}/app/models/user)
 
+
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
     # config.plugins = [ :exception_notification, :ssl_requirement, :all ]

config/routes.rb

@@ -129,6 +129,79 @@ Orbit::Application.routes.draw do
   namespace :panel do
     resources :users
   end
+
+  match '/desktop/'=>'desktop#index'
+
+  # Sinatra Routes start
+
+  # match '/desktop/desktop', :to => Desktopapp::DesktopApp 
+  # match '/desktop/app_manager', :to => Desktopapp::DesktopApp
+  # match '/desktop/sections', :to => Desktopapp::DesktopApp
+  # match '/desktop/settings', :to => Desktopapp::DesktopApp
+  # match '/desktop/get_desktop_settings/', :to => Desktopapp::DesktopApp
+  # match '/desktop/save_desktop_settings/', :to => Desktopapp::DesktopApp
+  # match '/desktop/getgroups/', :to => Desktopapp::DesktopApp
+  # match '/desktop/getsectionlist/', :to => Desktopapp::DesktopApp
+  # match '/desktop/settingthemes/', :to => Desktopapp::DesktopApp
+  # match '/desktop/settingsections/', :to => Desktopapp::DesktopApp
+  # match '/desktop/getapplist/', :to => Desktopapp::DesktopApp
+  # match '/desktop/newpositions/', :to => Desktopapp::DesktopApp
+  # match '/desktop/settingconnection/', :to => Desktopapp::DesktopApp
+
+  # match '/desktop/journal_p/', :to => Desktopapp::DesktopAppPublications
+  # match '/desktop/journal_p_list/', :to => Desktopapp::DesktopAppPublications
+  # match '/desktop/journal_p_add/', :to => Desktopapp::DesktopAppPublications
+  # match '/desktop_publications/getjournals', :to => Desktopapp::DesktopAppPublications
+
+  # match '/desktop/twitter/', :to => Desktopapp::Otheraccounts
+  # match '/desktop/forgmail/', :to => Desktopapp::Otheraccounts
+  # match '/desktop/getaccounts', :to => Desktopapp::Otheraccounts
+  # match '/desktop/save_account_info/', :to => Desktopapp::Otheraccounts
+
+  # match '/desktop_appstore/appstore', :to => Desktopapp::DesktopAppAppstore
+  # match '/desktop_appstore/widgets', :to => Desktopapp::DesktopAppAppstore
+  # match '/desktop_appstore/getuserwidgets', :to => Desktopapp::DesktopAppAppstore
+  # match '/desktop_appstore/widgets_settings', :to => Desktopapp::DesktopAppAppstore
+  
+  # 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/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/twitter/'=>'otheraccounts#twitter'
+  match '/desktop/forgmail/'=>'otheraccounts#gmail'
+  match '/desktop/getaccounts'=>'otheraccounts#getaccounts'
+  match '/desktop/save_account_info/'=>'otheraccounts#saveaccountinfo'
+
+  match '/desktop_appstore/appstore'=>'desktop_appstore#appstore'
+  match '/desktop_appstore/widgets'=>'desktop_appstore#widgets'
+  match '/desktop_appstore/onlinestore'=>'desktop_appstore#onlinestore'
+  match '/desktop_appstore/getuserwidgets'=>'desktop_appstore#getuserwidgets'
+  match '/desktop_appstore/widgets_settings'=>'desktop_appstore#widgets_settings'
+
+  match '/desktop_orbit/orbit' => 'desktop_orbit#orbit'
+  match '/desktop_orbit/getevents' => 'desktop_orbit#getevents'
+   #match '/desktop_orbit/getevents' => 'desktop_publications#create_journal'
+  #match '/desktop_orbit/getevents' => 'desktop_publications#delete_journal'
+
+  match '/desktop/temp_func/'=>'desktop#temp_func'
   
   match '/panel/:app_name/front_end/:app_action/:id' => 'pages#show_from_link', :constraints => lambda { |request|
     !request.query_string.include?("inner=true")