consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Show login to comment message in annotations

Browse Source 
This way it's consistent with what we get when there are no comments. It
only appears once on the page so it isn't overwhelming.
This commit is contained in:
Javi Martín
2021-10-01 02:45:38 +02:00
parent 9154614577
commit a0b4e35dbd
3 changed files with 3 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/votes.js
View File

@@ -14,7 +14,6 @@
initialize: function() { initialize: function() {
App.Votes.hoverize("div.votes"); App.Votes.hoverize("div.votes");
App.Votes.hoverize("div.supports"); App.Votes.hoverize("div.supports");
App.Votes.hoverize("div.comment-footer");
} }
}; };
}).call(this); }).call(this);

15
app/assets/stylesheets/legislation_process.scss
View File

@@ -630,21 +630,6 @@
.comments-wrapper { .comments-wrapper {
position: relative; position: relative;
.participation-not-allowed {
padding: rem-calc(20) rem-calc(8);
}
}
.comment-footer {
position: relative;
.participation-not-allowed {
font-size: rem-calc(14);
height: rem-calc(50);
padding: $line-height / 2;
top: -18px;
}
} }
.comment-input { .comment-input {

16
app/views/legislation/annotations/_comments_box.html.erb
View File

@@ -15,13 +15,10 @@
<% end %> <% end %>
<% end %> <% end %>
<% if @process.allegations_phase.open? %>
<a class="button publish-comment" href="#"><strong><%= t("legislation.annotations.comments.publish_comment") %></strong></a>
&nbsp;
<% end %>
<% if @process.allegations_phase.open? %> <% if @process.allegations_phase.open? %>
<% if user_signed_in? %> <% if user_signed_in? %>
<a class="button publish-comment" href="#"><strong><%= t("legislation.annotations.comments.publish_comment") %></strong></a>
&nbsp;
<% css_id = parent_or_commentable_dom_id(nil, annotation) %> <% css_id = parent_or_commentable_dom_id(nil, annotation) %>
<div id="js-comment-form-annotation-<%= annotation.id %>" style="display:none" class="comment-form js-comment-form-annotation"> <div id="js-comment-form-annotation-<%= annotation.id %>" style="display:none" class="comment-form js-comment-form-annotation">
<%= form_for @comment, url: legislation_process_draft_version_annotation_new_comment_path(annotation.draft_version.process, annotation.draft_version, annotation), remote: true do |f| %> <%= form_for @comment, url: legislation_process_draft_version_annotation_new_comment_path(annotation.draft_version.process, annotation.draft_version, annotation), remote: true do |f| %>
@@ -34,14 +31,7 @@
<% end %> <% end %>
</div> </div>
<% else %> <% else %>
<%= render "shared/login_to_comment" %>
<div>
<div class="participation-not-allowed" style="display: none;" aria-hidden="false">
<%= sanitize(t("users.login_to_comment",
signin: link_to_signin, signup: link_to_signup)) %>
</div>
</div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>