cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor diary comment form to use bootstrap

Browse source
This commit is contained in:
Andy Allan 2021-01-20 13:02:09 +00:00
parent cc8bb7c6a5
commit 8e02c98c3f
2 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/assets/stylesheets/common.scss
View file

@ -1282,11 +1282,6 @@ tr.turn:hover {
display: none;
margin-bottom: $lineheight;
}
#newcomment {
border-top: 1px solid $grey;
padding-top: $lineheight;
margin-top: $lineheight/2;
}
.comments {
max-width: 740px;
}
@ -1316,13 +1311,6 @@ tr.turn:hover {
float: left;
}
.diary-subscribe-buttons {
position: relative;
top: -30px;
left: 130px;
}
/* Rules for the log in page */
#login_auth_buttons {

22
app/views/diary_entries/show.html.erb
View file

@ -13,20 +13,20 @@
<%= render :partial => "diary_comment", :collection => @comments %>
</div>
<div class="standard-form">
<hr>
<div>
<% if current_user %>
<h3 id="newcomment"><%= t ".leave_a_comment" %></h3>
<%= error_messages_for "diary_comment" %>
<%= form_for @entry.comments.new, :url => { :action => "comment" } do |f| %>
<%= richtext_area :diary_comment, :body, :cols => 80, :rows => 15 %>
<%= f.submit %>
<% end %>
<% if @entry.subscribers.exists?(current_user.id) %>
<div class="diary-subscribe-buttons"><%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
<% else %>
<div class="diary-subscribe-buttons"><%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => :button %></div>
<%= bootstrap_form_for @entry.comments.new, :url => { :action => "comment" } do |f| %>
<%= f.richtext_field :body, :cols => 80, :rows => 20, :hide_label => true %>
<%= f.primary %>
<% if @entry.subscribers.exists?(current_user.id) %>
<%= link_to t("javascripts.changesets.show.unsubscribe"), diary_entry_unsubscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-light" %>
<% else %>
<%= link_to t("javascripts.changesets.show.subscribe"), diary_entry_subscribe_path(:display_name => @entry.user.display_name, :id => @entry.id), :method => :post, :class => "btn btn-light" %>
<% end %>
<% end %>
<% else %>
<h3 id="newcomment"><%= t(".login_to_leave_a_comment_html", :login_link => link_to(t(".login"), :controller => "users", :action => "login", :referer => request.fullpath)) %></h3>