X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=config%2Froutes.rb;h=02264de45881ca6cf0b19a8f4b142f98ed9b6764;hb=531ec75ef74c753607bbf08d1661883b49f68617;hp=43d500c19bf5560830757cb264131b0770fc911f;hpb=e093a769dad9ecc098b59671f99830bfa86533af;p=pettanr%2Fpettanr.git

diff --git a/config/routes.rb b/config/routes.rb
index 43d500c1..02264de4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,7 +2,9 @@ Pettanr::Application.routes.draw do
 
   devise_for :users , :controllers => { :registrations => "user_registrations" }
   devise_for :admins
-
+  
+  mount StandardLicenses::Engine => "/standard_licenses"
+  
   resources :authors do
     collection do
       get :index
@@ -76,6 +78,14 @@ 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
@@ -87,6 +97,7 @@ Pettanr::Application.routes.draw do
       get :browse
     end
     member do
+      get :credit
     end
   end
   resources :original_pictures do
@@ -114,14 +125,6 @@ Pettanr::Application.routes.draw do
       post :create
     end
   end
-  resources :standard_licenses do
-    new do
-      get :new
-    end
-    collection do
-      post :create
-    end
-  end
   resources :panels do
     new do
       get :new
@@ -237,6 +240,7 @@ Pettanr::Application.routes.draw do
   #   match 'products/:id' => 'catalog#view'
   # Keep in mind you can assign values other than :controller and :action
   match 'resource_pictures/:subdir/:id(.:format)/' => 'resource_pictures#show'
+  match 'pictures/:subdir/:id(.:format)/' => 'pictures#show'
   match 'home/(:action)', :controller => 'home'
   match 'help/(:action)', :controller => 'help'
   match 'system/(:action)', :controller => 'system'