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

improves html markup on activity tables

Browse Source
This commit is contained in:
decabeza
2017-10-18 18:54:43 +02:00
parent 05a713790f
commit eec05219cc
9 changed files with 64 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2033,7 +2033,6 @@ table {
// ------------
.activity {
margin-bottom: $line-height * 2;
.accordion li {
margin-bottom: $line-height / 2;
@@ -2065,54 +2064,8 @@ table {
}
}
table {
border: 0;
margin-bottom: 0;
}
td {
position: relative;
&:first-child {
padding-left: $line-height * 1.5;
width: 75%;
}
&::before {
color: $brand;
font-family: "icons" !important;
font-size: rem-calc(24);
left: 4px;
position: absolute;
}
}
.activity-comments td:first-child::before {
content: 'e';
top: 18px;
}
.activity-debates td:first-child::before {
content: 'i';
top: 14px;
}
.activity-proposals {
td:first-child::before {
content: 'h';
top: 18px;
}
.retired {
text-decoration: line-through;
}
}
.activity-investment-projects td:first-child::before,
.activity-ballot td:first-child::before {
content: '\53';
top: 10px;
.retired {
text-decoration: line-through;
}
}

4
app/views/users/_budget_investment.html.erb
View File

@@ -2,10 +2,10 @@
<td>
<%= link_to budget_investment.title, budget_investment_path(budget_investment.budget, budget_investment) %>
</td>
<td class="text-right">
<td>
<% if can? :destroy, budget_investment %>
<%= link_to t('shared.delete'), budget_investment_path(budget_investment.budget, budget_investment),
method: :delete, class: "button hollow alert" %>
method: :delete, class: "button hollow alert expanded" %>
<% end %>
</td>
</tr>

14
app/views/users/_budget_investments.html.erb
View File

@@ -1,7 +1,13 @@
<table id="budget_investments_list" class="clear activity-budget-investments">
<% @budget_investments.each do |budget_investment| %>
<%= render "budget_investment", budget_investment: budget_investment %>
<% end %>
<table id="budget_investments_list" class="margin-top">
<thead>
<th scope="col"><%= t("users.show.budget_investments") %></th>
<th scope="col"><%= t("users.show.actions") %></th>
</thead>
<tbody>
<% @budget_investments.each do |budget_investment| %>
<%= render "budget_investment", budget_investment: budget_investment %>
<% end %>
</tbody>
</table>
<%= paginate @budget_investments %>

25
app/views/users/_comments.html.erb
View File

@@ -1,13 +1,18 @@
<table class="clear activity-comments">
<% @comments.each do |comment| %>
<tr id="comment_<%= comment.id %>">
<td>
<%= comment_commentable_title(comment) %>
<br>
<%= comment.body %>
</td>
</tr>
<% end %>
<table class="margin-top">
<thead>
<th scope="col"><%= t("users.show.comments") %></th>
</thead>
<tbody>
<% @comments.each do |comment| %>
<tr id="comment_<%= comment.id %>">
<td>
<%= comment_commentable_title(comment) %>
<br>
<%= comment.body %>
</td>
</tr>
<% end %>
</tbody>
</table>
<%= paginate @comments %>

21
app/views/users/_debates.html.erb
View File

@@ -1,11 +1,16 @@
<table class="clear activity-debates">
<% @debates.each do |debate| %>
<tr id="debate_<%= debate.id %>">
<td>
<%= link_to debate.title, debate %>
</td>
</tr>
<% end %>
<table class="margin-top">
<thead>
<th scope="col"><%= t("users.show.debates") %></th>
</thead>
<tbody>
<% @debates.each do |debate| %>
<tr id="debate_<%= debate.id %>">
<td>
<%= link_to debate.title, debate %>
</td>
</tr>
<% end %>
</tbody>
</table>
<%= paginate @debates %>

4
app/views/users/_proposal.html.erb
View File

@@ -1,6 +1,6 @@
<tr id="proposal_<%= proposal.id %>">
<td>
<%= link_to proposal.title, proposal, proposal.retired? ? { class: 'retired' } : {} %>
<td class="small-9">
<strong><%= link_to proposal.title, proposal, proposal.retired? ? { class: 'retired' } : {} %></strong>
<br>
<%= proposal.summary %>
</td>

14
app/views/users/_proposals.html.erb
View File

@@ -1,7 +1,13 @@
<table class="clear activity-proposals">
<% @proposals.each do |proposal| %>
<%= render "proposal", proposal: proposal %>
<% end %>
<table class="margin-top">
<thead>
<th scope="col"><%= t("users.show.proposals") %></th>
<th scope="col" colspan="2"><%= t("users.show.actions") %></th>
</thead>
<tbody>
<% @proposals.each do |proposal| %>
<%= render "proposal", proposal: proposal %>
<% end %>
</tbody>
</table>
<%= paginate @proposals %>

5
config/locales/en/general.yml
View File

@@ -708,6 +708,11 @@ en:
deleted_debate: This debate has been deleted
deleted_proposal: This proposal has been deleted
deleted_budget_investment: This investment has been deleted
proposals: Proposals
debates: Debates
budget_investments: Budget investments
comments: Comments
actions: Actions
filters:
comments:
one: 1 Comment

5
config/locales/es/general.yml
View File

@@ -708,6 +708,11 @@ es:
deleted_debate: Este debate ha sido eliminado
deleted_proposal: Esta propuesta ha sido eliminada
deleted_budget_investment: Esta propuesta de inversión ha sido eliminada
proposals: Propuestas
debates: Debates
budget_investments: Proyectos de presupuestos participativos
comments: Comentarios
actions: Acciones
filters:
comments:
one: 1 Comentario