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

Merge pull request #1803 from consul/html-issue

Browse Source 
HTML Tag
This commit is contained in:
BertoCQ
2017-08-17 22:49:28 +02:00
committed by GitHub
parent eed30e6375 099c3f888d
commit 1e5c77293c
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/layout.scss
View File

@@ -1821,6 +1821,7 @@ table {
.divider { .divider {
color: $text-light; color: $text-light;
display: inline-block;
} }
form { form {

8
app/views/comments/_flag_actions.html.erb
View File

@@ -6,13 +6,13 @@
title="<%= t('shared.flag') %>"> title="<%= t('shared.flag') %>">
<span class="icon-flag flag-disable"></span> <span class="icon-flag flag-disable"></span>
</a> </a>
<div id="flag-drop-comment-<%= comment.id %>" <span id="flag-drop-comment-<%= comment.id %>"
class="dropdown-pane" class="dropdown-pane"
data-dropdown data-dropdown
data-auto-focus="true"> data-auto-focus="true">
<%= link_to t("shared.flag"), flag_comment_path(comment), method: :put, <%= link_to t("shared.flag"), flag_comment_path(comment), method: :put,
remote: true, id: "flag-comment-#{comment.id}" %> remote: true, id: "flag-comment-#{comment.id}" %>
</div> </span>
<% end %> <% end %>
<% if show_unflag_action? comment %> <% if show_unflag_action? comment %>
@@ -22,9 +22,9 @@
title="<%= t('shared.unflag') %>"> title="<%= t('shared.unflag') %>">
<span class="icon-flag flag-active"></span> <span class="icon-flag flag-active"></span>
</a> </a>
<div class="dropdown-pane" id="unflag-drop-comment-<%= comment.id %>" data-dropdown data-auto-focus="true"> <span class="dropdown-pane" id="unflag-drop-comment-<%= comment.id %>" data-dropdown data-auto-focus="true">
<%= link_to t("shared.unflag"), unflag_comment_path(comment), method: :put, <%= link_to t("shared.unflag"), unflag_comment_path(comment), method: :put,
remote: true, id: "unflag-comment-#{comment.id}" %> remote: true, id: "unflag-comment-#{comment.id}" %>
</div> </span>
<% end %> <% end %>
</span> </span>

8
app/views/debates/_flag_actions.html.erb
View File

@@ -3,17 +3,17 @@
<a id="flag-expand-debate-<%= debate.id %>" data-toggle="flag-drop-debate-<%= debate.id %>" title="<%= t('shared.flag') %>"> <a id="flag-expand-debate-<%= debate.id %>" data-toggle="flag-drop-debate-<%= debate.id %>" title="<%= t('shared.flag') %>">
<span class="icon-flag flag-disable"></span> <span class="icon-flag flag-disable"></span>
</a> </a>
<div class="dropdown-pane" id="flag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true"> <span class="dropdown-pane" id="flag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
<%= link_to t('shared.flag'), flag_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{ debate.id }" %> <%= link_to t('shared.flag'), flag_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{ debate.id }" %>
</div> </span>
<% end %> <% end %>
<% if show_unflag_action? debate %> <% if show_unflag_action? debate %>
<a id="unflag-expand-debate-<%= debate.id %>" data-toggle="unflag-drop-debate-<%= debate.id %>" title="<%= t('shared.unflag') %>"> <a id="unflag-expand-debate-<%= debate.id %>" data-toggle="unflag-drop-debate-<%= debate.id %>" title="<%= t('shared.unflag') %>">
<span class="icon-flag flag-active"></span> <span class="icon-flag flag-active"></span>
</a> </a>
<div class="dropdown-pane" id="unflag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true"> <span class="dropdown-pane" id="unflag-drop-debate-<%= debate.id %>" data-dropdown data-auto-focus="true">
<%= link_to t('shared.unflag'), unflag_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{ debate.id }" %> <%= link_to t('shared.unflag'), unflag_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{ debate.id }" %>
</div> </span>
<% end %> <% end %>
</span> </span>

8
app/views/proposals/_flag_actions.html.erb
View File

@@ -4,18 +4,18 @@
<a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>"> <a id="flag-expand-proposal-<%= proposal.id %>" data-toggle="flag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.flag') %>">
<span class="icon-flag flag-disable"></span> <span class="icon-flag flag-disable"></span>
</a> </a>
<div class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true"> <span class="dropdown-pane" id="flag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
<%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %> <%= link_to t('shared.flag'), flag_proposal_path(proposal), method: :put, remote: true, id: "flag-proposal-#{ proposal.id }" %>
</div> </span>
<% end %> <% end %>
<% if show_unflag_action? proposal %> <% if show_unflag_action? proposal %>
<a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.unflag') %>"> <a id="unflag-expand-proposal-<%= proposal.id %>" data-toggle="unflag-drop-proposal-<%= proposal.id %>" title="<%= t('shared.unflag') %>">
<span class="icon-flag flag-active"></span> <span class="icon-flag flag-active"></span>
</a> </a>
<div class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true"> <span class="dropdown-pane" id="unflag-drop-proposal-<%= proposal.id %>" data-dropdown data-auto-focus="true">
<%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %> <%= link_to t('shared.unflag'), unflag_proposal_path(proposal), method: :put, remote: true, id: "unflag-proposal-#{ proposal.id }" %>
</div> </span>
<% end %> <% end %>
</span> </span>
</span> </span>