frontend commits

config/routes.rb

@@ -224,7 +224,7 @@ Orbit::Application.routes.draw do
 
   match '/desktop/temp_func/'=>'desktop#temp_func'
   
-  match '/panel/:app_name/front_end/:app_action/:id/*controller_action' => 'pages#show_from_link', :constraints => lambda { |request|
+  match '/panel/:app_name/front_end/:app_action/:id(/:controller_action)' => 'pages#show_from_link', :constraints => lambda { |request|
     !request.query_string.include?("inner=true")
   }