Merge branch 'v04' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v04

[pettanr/pettanr.git] / config / routes.rb

diff --git a/config/routes.rb b/config/routes.rb
index 2a20daa..f984d8e 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,14 +1,17 @@
 Pettanr::Application.routes.draw do
 
+  devise_for :users , :controllers => { :registrations => "user_registrations" }
   devise_for :admins
-  devise_for :authors, :controllers => { :registrations => "author_registrations" }
-
-  match 'original_pictures/:id(.:format)/refresh' => 'original_pictures#refresh'
-
-  resources :artists do
+  
+  Pettanr::Application.licenses.each do |name, klass|
+    mount Module.const_get(klass)::Engine => "/#{name}"
+  end
+  
+  resources :authors do
     collection do
       get :index
       get :show
+      get :count
       post :create
       get :list
       get :browse
@@ -18,17 +21,21 @@ Pettanr::Application.routes.draw do
       delete :destroy
     end
   end
-  resources :speaches do
+  resources :artists do
     collection do
       get :index
       get :show
+      get :count
+      post :create
       get :list
       get :browse
     end
     member do
+      put :update
+      delete :destroy
     end
   end
-  resources :balloons do
+  resources :speech_balloon_templates do
     collection do
       get :index
       get :show
@@ -36,39 +43,31 @@ Pettanr::Application.routes.draw do
       get :browse
     end
     member do
+      delete :destroy
     end
   end
-  resources :speach_templates do
+  resources :speeches do
     collection do
-      get :index
-      get :show
       get :list
       get :browse
     end
     member do
     end
   end
-  resources :balloon_templates do
+  resources :balloons do
     collection do
-      get :index
-      get :show
       get :list
       get :browse
     end
     member do
     end
   end
-  resources :speach_balloons do
+  resources :speech_balloons do
     collection do
-      get :index
-      get :show
-      post :create
       get :list
       get :browse
     end
     member do
-      put :update
-      delete :destroy
     end
   end
   resources :panel_pictures do
@@ -81,21 +80,36 @@ Pettanr::Application.routes.draw do
     member do
     end
   end
+  resources :pictures do
+    collection do
+      get :show
+    end
+    member do
+      get :credit
+    end
+  end
   resources :resource_pictures do
     collection do
       get :index
+      get :new
       get :show
+      post :create
+      get :count
       get :list
       get :browse
     end
     member do
+      get :credit
     end
   end
   resources :original_pictures do
+    new do
+      get :new
+    end
     collection do
       get :index
       get :show
-      get :new
+      get :history
       post :create
       get :list
       get :browse
@@ -106,10 +120,50 @@ Pettanr::Application.routes.draw do
       delete :destroy
     end
   end
+  resources :original_picture_license_groups do
+    new do
+      get :new
+    end
+    collection do
+      post :create
+    end
+  end
+  resources :colors do
+    collection do
+      get :index
+    end
+    member do
+    end
+  end
+  resources :panel_colors do
+    collection do
+      get :index
+    end
+    member do
+    end
+  end
+  resources :ground_colors do
+    collection do
+      get :index
+    end
+    member do
+    end
+  end
+  resources :ground_pictures do
+    collection do
+      get :index
+    end
+    member do
+    end
+  end
   resources :panels do
+    new do
+      get :new
+    end
     collection do
       get :index
       get :show
+      get :count
       post :create
       get :list
       get :browse
@@ -119,9 +173,11 @@ Pettanr::Application.routes.draw do
       delete :destroy
     end
   end
-  resources :comics do #, except: [:new, :edit]
+  resources :stories do
+    new do
+      get :new
+    end
     collection do
-      get :index
       get :show
       post :create
       get :list
@@ -132,40 +188,37 @@ Pettanr::Application.routes.draw do
       delete :destroy
     end
   end
-  resources :lisences do
-    collection do
-      get :index
-      get :show
-      get :list
-      get :browse
+  resources :comics do
+    new do
+      get :new
     end
-  end
-  resources :original_lisences do
     collection do
       get :index
       get :show
-      get :new
+      get :count
       post :create
       get :list
       get :browse
     end
     member do
-      get :edit
       put :update
       delete :destroy
     end
   end
-  resources :common_lisences do
+  resources :licenses do
     collection do
       get :index
       get :show
-      post :create
       get :list
       get :browse
     end
-    member do
-      put :update
-      delete :destroy
+  end
+  resources :license_groups do
+    collection do
+      get :index
+      get :show
+      get :list
+      get :browse
     end
   end
   resources :system_pictures do
@@ -188,17 +241,12 @@ Pettanr::Application.routes.draw do
   # Sample of regular route:
   #   match 'products/:id' => 'catalog#view'
   # Keep in mind you can assign values other than :controller and :action
-  match 'comics/:id(.:format)/play' => 'comics#play'
   match 'resource_pictures/:subdir/:id(.:format)/' => 'resource_pictures#show'
+  match 'pictures/:subdir/:id(.:format)/' => 'pictures#show'
+  match 'stories/comic/:id(.:format)' => 'stories#comic'
   match 'home/(:action)', :controller => 'home'
-  match 'help/(:action)', :controller => 'help'
   match 'system/(:action)', :controller => 'system'
   match 'authors/(:action(/:id))', :controller => 'authors'
-#  controller 'system' do
-#    get 'start'
-#    get 'index'
-##    match 'start', :to => 'system#start'
-#  end
   
   # Sample of named route:
   #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase