refactor controller names

tallakt · Mar 1, 2010 · 7af27a5 · 7af27a5
1 parent 79a83c3
commit 7af27a5
Show file tree

Hide file tree

Showing 18 changed files with 11 additions and 22 deletions.
diff --git a/app/controllers/camera_controller.rb → app/controllers/capture_controller.rb b/app/controllers/camera_controller.rb → app/controllers/capture_controller.rb
@@ -1,4 +1,4 @@
-class CameraController < ApplicationController
+class CaptureController < ApplicationController
   before_filter :update_feedback, :except => [:perform_capture]
 
   def index

diff --git a/app/controllers/camera_config_controller.rb → app/controllers/config_controller.rb b/app/controllers/camera_config_controller.rb → app/controllers/config_controller.rb
@@ -1,4 +1,4 @@
-class CameraConfigController < ApplicationController
+class ConfigController < ApplicationController
   before_filter :update_feedback, :except => [:select_option]
 
   def index

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
diff --git a/app/helpers/camera_config_helper.rb b/app/helpers/camera_config_helper.rb
diff --git a/app/helpers/camera_helper.rb b/app/helpers/camera_helper.rb
diff --git a/app/helpers/cleanup_helper.rb b/app/helpers/cleanup_helper.rb
diff --git a/app/views/camera/_download_button.html.haml → app/views/capture/_download_button.html.haml b/app/views/camera/_download_button.html.haml → app/views/capture/_download_button.html.haml
diff --git a/app/views/camera/_image_links.html.haml → app/views/capture/_image_links.html.haml b/app/views/camera/_image_links.html.haml → app/views/capture/_image_links.html.haml
diff --git a/app/views/camera/_mode.haml → app/views/capture/_mode.html.haml b/app/views/camera/_mode.haml → app/views/capture/_mode.html.haml
diff --git a/app/views/camera/_thumbnail.html.haml → app/views/capture/_thumbnail.html.haml b/app/views/camera/_thumbnail.html.haml → app/views/capture/_thumbnail.html.haml
diff --git a/app/views/camera/index.html.haml → app/views/capture/index.html.haml b/app/views/camera/index.html.haml → app/views/capture/index.html.haml
@@ -17,4 +17,4 @@
     = render :partial => 'download_button'
 
 
-= periodically_call_remote :url => 'camera', :frequency => 1.0, :method => :get
+= periodically_call_remote :url => 'capture', :frequency => 1.0, :method => :get
diff --git a/app/views/camera/index.rjs → app/views/capture/index.rjs b/app/views/camera/index.rjs → app/views/capture/index.rjs
@@ -1,4 +1,4 @@
-page.replace_html 'mode', render(:partial => 'camera/mode')
+page.replace_html 'mode', render(:partial => 'capture/mode')
 
 if @preview && @preview.thumbnail
   page.replace_html 'preview', render(:partial => 'thumbnail', :locals => {:preview => @preview})

diff --git a/app/views/cleanup/index.rjs b/app/views/cleanup/index.rjs
@@ -1,2 +1,2 @@
-page.replace_html 'mode', render(:partial => 'camera/mode')
+page.replace_html 'mode', render(:partial => 'capture/mode')
 page.replace_html 'count', render(:partial => 'cleanup/count')
diff --git a/...config/_single_option_table_row.html.haml → ...config/_single_option_table_row.html.haml b/...config/_single_option_table_row.html.haml → ...config/_single_option_table_row.html.haml
diff --git a/app/views/camera_config/index.html.haml → app/views/config/index.html.haml b/app/views/camera_config/index.html.haml → app/views/config/index.html.haml
@@ -22,4 +22,4 @@
 %p
   Note that many Canon EOS cameras require version 2.4.8 or newer in order to work.
 
-= periodically_call_remote :url => 'camera_config/update', :frequency => 1.0, :method => :get
+= periodically_call_remote :url => 'config/update', :frequency => 1.0, :method => :get
diff --git a/app/views/camera_config/update.rjs → app/views/config/update.rjs b/app/views/camera_config/update.rjs → app/views/config/update.rjs
@@ -1,4 +1,4 @@
-page.replace_html 'mode', render(:partial => 'camera/mode')
+page.replace_html 'mode', render(:partial => 'capture/mode')
 
 @options.each do |o|
   page.replace_html "camera_option_#{o.id}", render(:partial => 'single_option_table_row', :locals => {:o => o})

diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -14,14 +14,14 @@
     = flash[:notice]
 
   #mode
-    = render :partial => 'camera/mode'
+    = render :partial => 'capture/mode'
 
   = yield
 
 
   .links
-    =link_to 'Capture', :controller => :camera
-    =link_to 'Camera config', :controller => :camera_config
+    =link_to 'Capture', :controller => :capture
+    =link_to 'Config', :controller => :config
     =link_to 'Cleanup', :controller => :cleanup
 
   #bunntekst

diff --git a/config/routes.rb b/config/routes.rb
@@ -32,7 +32,7 @@
 
   # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
   # map.root :controller => "welcome"
-  map.root :controller => :camera
+  map.root :controller => :capture
 
   # See how all your routes lay out with "rake routes"