desktop mods

Conflicts:
	config/routes.rb

Gemfile

@@ -8,9 +8,9 @@ gem 'sass-rails', '~> 4.0.2'
 gem 'uglifier', '>= 1.3.0'
 gem 'coffee-rails', '~> 4.0.0'
 gem 'jquery-rails'
-gem 'jquery-ui-rails', "4.0.5"
+gem 'jquery-ui-rails', "5.0.0"
 gem 'turbolinks'
-
+gem 'normalize-rails', '~> 3.0.1'
 #password
 gem 'bcrypt-ruby', '~> 3.1.5'
 
@@ -69,3 +69,8 @@ group :test do
   gem 'minitest-spec-rails'
 end
 
+#desktop
+gem 'angularjs-rails', '~> 1.2.20'
+gem 'angular-ui-bootstrap-rails', '~> 0.11.0'
+gem 'jquery_mousewheel_rails', '~> 3.1.11.3'
+

app/assets/javascripts/basic.js

@@ -2,7 +2,7 @@
 //= require jquery_ujs
 
 //= require basic/bootstrap
-//= require jquery.ui.tooltip
+//= require jquery-ui/tooltip
 //= require basic/iscroll
 //= require basic/orbit_js_1.0.1.js
 //= require basic/jquery.nanoscroller.js

app/assets/javascripts/structure.js

@@ -1,4 +1,4 @@
 //= require basic
-//= require jquery.ui.sortable
+//= require jquery-ui/sortable
 //= require lib/jquery.ui.touch-punch.min.js
 //= require lib/jquery.mjs.nestedSortable.js

built_in_extensions.rb

@@ -19,4 +19,7 @@ gem 'personal_research', git: 'git@gitlab.tp.rulingcom.com:saurabh/personal-rese
 
 #widgets
 gem "site_menu_widget", git: 'git@gitlab.tp.rulingcom.com:saurabh/site-menu-widget.git'
-gem "breadcrumb_widget", git: "git@gitlab.tp.rulingcom.com:saurabh/breadcrumb-widget.git"
+gem "breadcrumb_widget", git: "git@gitlab.tp.rulingcom.com:saurabh/breadcrumb-widget.git"
+
+#desktop
+gem "orbit_4_5_desktop", path: '/Users/Ray/Documents/orbit_4_5_desktop'

config/routes.rb

@@ -6,6 +6,7 @@ Orbit::Application.routes.draw do
 
   get "logout", to: "sessions#destroy", as: "logout"
 
+  get "desktop" => 'desktop#index'
 
   get "/pages/edit_view" => "pages#edit_view"
   get "/pages/preview" => "pages#preview"
@@ -17,12 +18,12 @@ Orbit::Application.routes.draw do
   get "/page_parts/edit_sub_part" => "page_parts#edit_sub_part"
 
   resources :pages
-  resources :page_parts do 
+  resources :page_parts do
       member do
         patch 'update_sub_part'
       end
     end
- 
+
   get "/module/:name" => "home#index"
   get "/module/:name/show" => "home#show"
   # The priority is based upon order of creation: first created -> highest priority.
@@ -38,7 +39,7 @@ Orbit::Application.routes.draw do
   locales = Site.first.in_use_locales rescue I18n.available_locales
 
   scope "(:locale)", locale: Regexp.new((locales+[:zh_cn]).join("|")) do
-    
+
     get 'users/form' => "users#form_page"
     get 'users/role_page' => "users#role_page"
     get 'users/check_availability' => "users#check_availability"
@@ -54,7 +55,7 @@ Orbit::Application.routes.draw do
       end
     end
 
-   
+
 
 
     # Facebook routes
@@ -69,7 +70,7 @@ Orbit::Application.routes.draw do
     resources :passwords
     # resources :members do
     #   collection do
-    #     get ':name-:uid', to: 'members#show', as: :display   
+    #     get ':name-:uid', to: 'members#show', as: :display
     #   end
     # end
 
@@ -87,7 +88,8 @@ Orbit::Application.routes.draw do
       end
 
       get "members/get_role_fields/:id" => "members#get_role_fields", :as => :get_role_fields      
-      get "members/unapproved_members" => "members#unapproved_members"      
+      get "members/unapproved_members" => "members#unapproved_members"
+      
       resources :members do
         collection do
           get 'edit_order_card'
@@ -118,7 +120,7 @@ Orbit::Application.routes.draw do
       end
 
       get 'select_emails' => 'member_selects#select_emails', :as => "select_emails"
-      
+
       resources :module_apps do
         resources :categories do
           collection do
@@ -141,7 +143,7 @@ Orbit::Application.routes.draw do
         end
       end
 
-      resources :assets do   
+      resources :assets do
         collection do
           post 'file_upload'
           get 'delete'
@@ -150,7 +152,6 @@ Orbit::Application.routes.draw do
       end
 
       get 'authorizations(/:module)' => 'authorizations#index', :as => :authorizations
-      
       resources :authorizations
       resources :items
       resources :categories do
@@ -187,9 +188,9 @@ Orbit::Application.routes.draw do
 	       get 'check_updates'
 	       get 'update_orbit'
 	       get 'restart_server'
-              get 'delete_mail_log'             
+              get 'delete_mail_log'
 	     end
-    
+
       resources :designs do
         collection do
           get 'upload_package'