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

Merge remote-tracking branch 'upstream/pull/4518'

Browse source
This commit is contained in:
Tom Hughes 2024-02-14 18:21:23 +00:00
commit e3c88b0736
4 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -827,14 +827,11 @@ tr.turn:hover {
height: 400px;
display: none;
}
.comments {
max-width: 740px;
.diary-comment .col-auto {
width: 62px;
}
.diary-comment {
border-top: 1px dashed $grey;
&:first-child {
border-top: 1px solid $grey;
}
.diary-comment .col {
max-width: 690px;
}
}

4
app/views/diary_entries/_diary_comment.html.erb
View file

@ -1,5 +1,5 @@
<div class="row diary-comment py-3<%= " text-muted bg-danger bg-opacity-10" unless diary_comment.visible? %>">
<div class="col-auto">
<div class="row diary-comment border-bottom py-3<%= " text-muted bg-danger bg-opacity-10" unless diary_comment.visible? %>">
<div class="col-auto pe-0 text-center">
<%= user_thumbnail diary_comment.user %>
</div>
<div class="col">

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

@ -12,11 +12,23 @@
<%= render @entry %>
<div id="comments" class="comments">
<%= render :partial => "diary_comment", :collection => @comments %>
</div>
<div id="comments" class="comments mb-3">
<div class="row border-bottom border-grey">
<h2 class="col"><%= t(".discussion") %></h2>
<hr>
<% if current_user %>
<div class="col-auto">
<% 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-sm btn-primary" %>
<% 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-sm btn-primary" %>
<% end %>
</div>
<% end %>
</div>
<%= render :partial => "diary_comment", :collection => @comments %>
</div>
<div>
<% if current_user %>
@ -25,11 +37,6 @@
<%= 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"), login_path(:referer => request.fullpath))) %></h3>