This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mercury_editor /editor(/*requested_uri)(.:format) {:controller=>"mercury", :action=>"edit"} | |
mercury_images GET /mercury/images(.:format) {:action=>"index", :controller=>"mercury/images"} | |
POST /mercury/images(.:format) {:action=>"create", :controller=>"mercury/images"} | |
new_mercury_image GET /mercury/images/new(.:format) {:action=>"new", :controller=>"mercury/images"} | |
edit_mercury_image GET /mercury/images/:id/edit(.:format) {:action=>"edit", :controller=>"mercury/images"} | |
mercury_image GET /mercury/images/:id(.:format) {:action=>"show", :controller=>"mercury/images"} | |
PUT /mercury/images/:id(.:format) {:action=>"update", :controller=>"mercury/images" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<h3 class="title-text title-text-top0">Добавить отзыв</h3> | |
<<<<<<< HEAD | |
<%= form_for [@page, @comment] do |f| %> | |
<div class="row-form1 clear"> | |
<div class="col-1 fleft"> | |
<div class="row-form1 clear"> | |
<div class="row-form1-left fleft">Имя:</div> | |
<div class="row-form1-right fleft"><%= f.text_field :user_name %></div> | |
</div> | |
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
class AddNewFieldsToComments < ActiveRecord::Migration | |
def self.up | |
<<<<<<< HEAD | |
add_column :comments, :ip, :string | |
add_column :comments, :rate, :integer | |
add_column :comments, :email, :string | |
add_column :comments, :user_name, :string | |
add_column :comments, :description, :text | |
add_column :comments, :page_id, :integer | |
remove_column :comments, :title |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
port-169-adslby-pool-109-232-117:Saygo pavel$ rake routes | |
mercury_editor /editor(/*requested_uri)(.:format) {:controller=>"mercury", :action=>"edit"} | |
mercury_images GET /mercury/images(.:format) {:action=>"index", :controller=>"mercury/images"} | |
POST /mercury/images(.:format) {:action=>"create", :controller=>"mercury/images"} | |
new_mercury_image GET /mercury/images/new(.:format) {:action=>"new", :controller=>"mercury/images"} | |
edit_mercury_image GET /mercury/images/:id/edit(.:format) {:action=>"edit", :controller=>"mercury/images"} | |
mercury_image GET /mercury/images/:id(.:format) {:action=>"show", :controller=>"mercury/images"} | |
PUT /mercury/images/:id(.:format) {:action=>"update", |