From bbc171fc7ce50d520f5ea9fca7ce80c0a01ff576 Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 8 Aug 2014 18:07:39 +0800
Subject: [PATCH] desktop mods with new layout stuff

---
 app/assets/javascripts/member-selection.js | 2 +-
 config/initializers/keyword_constraint.rb  | 2 +-
 config/routes.rb                           | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/member-selection.js b/app/assets/javascripts/member-selection.js
index 23d2450..443dbeb 100644
--- a/app/assets/javascripts/member-selection.js
+++ b/app/assets/javascripts/member-selection.js
@@ -125,7 +125,7 @@ $(document).ready(function() {
     var user_ids = [],
         role_ids =[],
         users = $('.selected_user input[type="checkbox"]:checked'),
-        roles = $('.selected_role input[type="checkbox"]:checked')
+        roles = $('.selected_role input[type="checkbox"]:checked');
 
     users.each(function() {
       user_ids.push($(this).parent().attr('id'));
diff --git a/config/initializers/keyword_constraint.rb b/config/initializers/keyword_constraint.rb
index 5579878..8efb04d 100644
--- a/config/initializers/keyword_constraint.rb
+++ b/config/initializers/keyword_constraint.rb
@@ -1,6 +1,6 @@
 class KeywordConstraint
    def matches?(request)
-   	  keywords = ["/admin", "//desktop", "/user", "/signup", "/login"]
+   	  keywords = ["/admin", "/desktop", "/user", "/signup", "/login"]
       keywords.all? { |k| !request.url.include?(k) }
    end
 end
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index d88b484..e23e89d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -6,8 +6,6 @@ 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"
   get "/pages/get_categories" => "pages#get_categories"