From e12b14311effd5b8d849bfc30711edfed15daa99 Mon Sep 17 00:00:00 2001 From: saurabhbhatia Date: Tue, 30 Jul 2013 16:15:04 +0800 Subject: [PATCH] Updated Desktop with new UI --- app/controllers/desktop_apps_controller.rb | 2 ++ app/controllers/desktop_themes_controller.rb | 2 ++ app/controllers/desktop_widgets_controller.rb | 2 ++ app/views/layouts/desktop.html.erb | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/controllers/desktop_apps_controller.rb b/app/controllers/desktop_apps_controller.rb index 655ad024c..405aef777 100644 --- a/app/controllers/desktop_apps_controller.rb +++ b/app/controllers/desktop_apps_controller.rb @@ -5,6 +5,7 @@ class DesktopAppsController < OrbitBackendController def index @desktopapps = DesktopApp.all + render :layout => false end def upload @@ -17,6 +18,7 @@ class DesktopAppsController < OrbitBackendController unzip_app(temp_file,filename) temp_file.close end + render :layout => false end def unzip_app(file, zip_name) diff --git a/app/controllers/desktop_themes_controller.rb b/app/controllers/desktop_themes_controller.rb index 1cfa27051..121fea219 100644 --- a/app/controllers/desktop_themes_controller.rb +++ b/app/controllers/desktop_themes_controller.rb @@ -5,6 +5,7 @@ class DesktopThemesController < OrbitBackendController def index @desktopThemes = DesktopTheme.all + render :layout => false end def destroy @@ -27,6 +28,7 @@ class DesktopThemesController < OrbitBackendController #end temp_file.close end + render :layout => false end def edit @dw = DesktopWidget.find(params[:id]) diff --git a/app/controllers/desktop_widgets_controller.rb b/app/controllers/desktop_widgets_controller.rb index f52a58c99..5b671710e 100644 --- a/app/controllers/desktop_widgets_controller.rb +++ b/app/controllers/desktop_widgets_controller.rb @@ -5,6 +5,7 @@ class DesktopWidgetsController < OrbitBackendController def index @desktopWidgets = DesktopWidget.all + render :layout => false end def upload @@ -21,6 +22,7 @@ class DesktopWidgetsController < OrbitBackendController #end temp_file.close end + render :layout => false end def edit @dw = DesktopWidget.find(params[:id]) diff --git a/app/views/layouts/desktop.html.erb b/app/views/layouts/desktop.html.erb index 15ca16ec3..b9780a487 100644 --- a/app/views/layouts/desktop.html.erb +++ b/app/views/layouts/desktop.html.erb @@ -13,8 +13,8 @@ - <%= stylesheet_link_tag "desktop" %> - <%= javascript_include_tag "desktop" %> + <%= stylesheet_link_tag "desktop/desktop" %> + <%= javascript_include_tag "desktop/desktop" %> <%= csrf_meta_tag %>