From 73e76f24772926bd89a43dcf4a513839cc0887af Mon Sep 17 00:00:00 2001 From: Harry Bomrah Date: Wed, 21 Nov 2012 17:39:01 +0800 Subject: [PATCH] routes fixed --- app/assets/javascripts/orbitdesktop.js | 2 +- config/routes.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/orbitdesktop.js b/app/assets/javascripts/orbitdesktop.js index 7bcaa92c..bf5e35fe 100755 --- a/app/assets/javascripts/orbitdesktop.js +++ b/app/assets/javascripts/orbitdesktop.js @@ -63,7 +63,7 @@ var orbitDesktop = function(dom){ o.bindDesktopEvents(); o.loadIconCache(); - $(o.contentHolder).empty().load("desktop",function(){ + $(o.contentHolder).empty().load("/desktop/desktop",function(){ o.desktopData["d_desktop"] = ""; o.initializeDesktop("d_desktop","",false); }) diff --git a/config/routes.rb b/config/routes.rb index 419295da..45dae242 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -147,9 +147,9 @@ Orbit::Application.routes.draw do post 'upload' end end - + match "desktop" => "desktop#index" namespace :desktop do - match "/" => "desktop#index" + 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'