From 4ee683aa9bc0caada96d6639d5b5311e198530e7 Mon Sep 17 00:00:00 2001
From: Rueshyna <rueshyna(XD)gmail.com>
Date: Mon, 7 Jan 2013 16:38:02 +0800
Subject: [PATCH] fixed desktop route

---
 config/environments/development.rb |  2 +-
 config/routes.rb                   | 36 +++++++++++++++---------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 1ae657f6..ed5dc3a6 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -10,7 +10,7 @@ Orbit::Application.configure do
   config.whiny_nils = true
 
   # Show full error reports and disable caching
-  config.consider_all_requests_local       = false
+  config.consider_all_requests_local       = true
   #config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = true
 
diff --git a/config/routes.rb b/config/routes.rb
index 2c52f6ec..78a57308 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -164,25 +164,25 @@ Orbit::Application.routes.draw do
   end
 
   match "desktop" =>  "desktop#index"
-  namespace :desktop do
-   match "desktop" => "desktop#desktop"
-    match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
-    match '/desktop'=>'desktop#desktop'
-    match '/app_manager'=>'desktop#app_manager'
-    match '/allsections'=>'desktop#allsections'
-    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 '/themes/'=>'desktop#themes'
-    match '/sections/'=>'desktop#sections'
-    match '/getapplist/'=>'desktop#getapplist'
-    match '/newpositions/'=>'desktop#newpositions'
-    match '/connections/'=>'desktop#connections'
-    match '/widget_layout' => 'desktop#widget_layout'
-    match '/temp_func/'=>'desktop#temp_func'
+  match "/desktop/desktop" => "desktop#desktop"
+  match '/desktop/desktop'=>'desktop#desktop'
+  match '/desktop/app_manager'=>'desktop#app_manager'
+  match '/desktop/allsections'=>'desktop#allsections'
+  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/themes/'=>'desktop#themes'
+  match '/desktop/sections/'=>'desktop#sections'
+  match '/desktop/getapplist/'=>'desktop#getapplist'
+  match '/desktop/newpositions/'=>'desktop#newpositions'
+  match '/desktop/connections/'=>'desktop#connections'
+  match '/desktop/widget_layout' => 'desktop#widget_layout'
+  match '/desktop/temp_func/'=>'desktop#temp_func'
 
+  namespace :desktop do
+    match '/journal_pages/get_journals_json' => 'journal_pages#get_journals_json'
     resources :journal_pages, except: :show
     resources :journal_lists, only: :index
     resources :co_authors, except: :show