Skip to content

Instantly share code, notes, and snippets.

@ka8725
Forked from EnotPoloskunAndIluhaAndr/gist:1783208
Created February 9, 2012 21:07
Show Gist options
  • Select an option

  • Save ka8725/1783228 to your computer and use it in GitHub Desktop.

Select an option

Save ka8725/1783228 to your computer and use it in GitHub Desktop.

Revisions

  1. ka8725 revised this gist Feb 9, 2012. 1 changed file with 0 additions and 28 deletions.
    28 changes: 0 additions & 28 deletions gistfile1.erb
    Original file line number Diff line number Diff line change
    @@ -1,31 +1,4 @@
    <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>
    <div class="col-2 fleft">
    <div class="row-form1 clear">
    <div class="row-form1-left fleft">Email:</div>
    <div class="row-form1-right fleft"><%= f.text_field :email %></div>
    </div>
    </div>
    </div>
    <div class="row-form1 clear">
    <div class="row-form1-left fleft">Отзыв:</div>
    <div class="row-form1-right fleft"><%= f.text_area :description,:rows => 2,:cols => 2 %></textarea></div>
    </div>
    <div class="row-form1 clear">
    <div class="row-form1-left fleft">Рейтинг:</div>
    <div class="row-form1-right fleft"><span class="bg-star"><span><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span><a href="#"></a></span></div>
    </div>
    <%= f.submit '', :class => "button-submit1" %>
    <% end %>
    =======
    <%= form_for [@page, @comment] do |f| %>
    <div class="row-form1 clear">
    <div class="col-1 fleft">
    @@ -60,4 +33,3 @@
    <%= f.submit "send", :class => "button-submit1", :value => "&nbsp;".html_safe %>

    <% end %>
    >>>>>>> some fixes
  2. @EnotPoloskunAndIluhaAndr EnotPoloskunAndIluhaAndr created this gist Feb 9, 2012.
    63 changes: 63 additions & 0 deletions gistfile1.erb
    Original file line number Diff line number Diff line change
    @@ -0,0 +1,63 @@
    <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>
    <div class="col-2 fleft">
    <div class="row-form1 clear">
    <div class="row-form1-left fleft">Email:</div>
    <div class="row-form1-right fleft"><%= f.text_field :email %></div>
    </div>
    </div>
    </div>
    <div class="row-form1 clear">
    <div class="row-form1-left fleft">Отзыв:</div>
    <div class="row-form1-right fleft"><%= f.text_area :description,:rows => 2,:cols => 2 %></textarea></div>
    </div>
    <div class="row-form1 clear">
    <div class="row-form1-left fleft">Рейтинг:</div>
    <div class="row-form1-right fleft"><span class="bg-star"><span><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span><a href="#"></a></span></div>
    </div>
    <%= f.submit '', :class => "button-submit1" %>
    <% end %>
    =======
    <%= 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>
    <div class="col-2 fleft">
    <div class="row-form1 clear">
    <div class="row-form1-left fleft">Email:</div>
    <div class="row-form1-right fleft"><%= f.text_field :email %></div>
    </div>
    </div>
    </div>
    <div class="row-form1 clear">
    <div class="row-form1-left fleft">Отзыв:</div>
    <div class="row-form1-right fleft"><%= f.text_area :description,:rows => 2,:cols => 2 %></textarea></div>
    </div>
    <div class="row-form1 clear">
    <div class="row-form1-left fleft">Рейтинг:</div>
    <div class="row-form1-right fleft"><span class="bg-star"><span><a href="#"></a><a href="#"></a><a href="#"></a><a href="#"></a></span><a href="#"></a></span></div>
    </div>
    Rating: <span id="stars-cap"></span>
    <div id="stars-wrapper2">
    <%= f.radio_button :rate, 1, :name => "newrate"%>
    <%= f.radio_button :rate, 2, :name => "newrate"%>
    <%= f.radio_button :rate, 3, :name => "newrate" %>
    <%= f.radio_button :rate, 4, :name => "newrate" %>
    <%= f.radio_button :rate, 5, :name => "newrate" %>
    </div>
    <%= f.submit "send", :class => "button-submit1", :value => "&nbsp;".html_safe %>

    <% end %>
    >>>>>>> some fixes