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

Improves styles

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-03-08 17:13:08 +01:00
parent 7cf66f2b5d
commit dee52c279f
5 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/views/admin/spending_proposals/_written_by_author.html.erb
View File

@@ -1,22 +1,26 @@
<h2><%= t "admin.spending_proposals.show.heading", id: @spending_proposal.id %></h2>
<h1><%= @spending_proposal.title %></h1>
<div class="callout primary float-right">
<%= t "admin.spending_proposals.show.heading", id: @spending_proposal.id %>
</div>
<div class="row small-collapse">
<div class="small-12 medium-4 columns">
<br>
<h1 class="inline-block"><%= @spending_proposal.title %></h1>
<div class="row small-collapse info">
<div class="small-12 medium-4 column">
<p>
<strong><%= t("admin.spending_proposals.show.geozone") %>:</strong>
<%= geozone_name(@spending_proposal) %>
</p>
</div>
<div class="small-12 medium-4 columns">
<div class="small-12 medium-4 column">
<p>
<strong><%= t("admin.spending_proposals.show.by") %>:</strong>
<%= link_to @spending_proposal.author.name, admin_user_path(@spending_proposal.author) %>
</p>
</div>
<div class="small-12 medium-4 columns">
<div class="small-12 medium-4 column">
<p>
<strong><%= t("admin.spending_proposals.show.sent") %>:</strong>
<%= l @spending_proposal.created_at, format: :datetime %>
@@ -32,7 +36,7 @@
<% end %>
<% if @spending_proposal.external_url.present? %>
<p><%= text_with_links @spending_proposal.external_url %></p>
<p><%= text_with_links @spending_proposal.external_url %>&nbsp;<i class="icon-external small"></i></p>
<% end %>
<%= safe_html_with_links @spending_proposal.description %>

41
app/views/admin/spending_proposals/index.html.erb
View File

@@ -1,27 +1,27 @@
<h2><%= t("admin.spending_proposals.index.title") %></h2>
<div>
<div class="row margin">
<%= form_tag admin_spending_proposals_path, method: :get, enforce_utf8: false do %>
<div class="small-12 medium-4 column float-right">
<%= select_tag :tag_name,
options_for_select(spending_proposal_tags_select_options, params[:tag_name]),
{ prompt: t("admin.spending_proposals.index.tags_filter_all"),
label: false,
class: "js-submit-on-change" } %>
<div class="small-12 medium-4 column">
<%= select_tag :administrator_id,
options_for_select(admin_select_options, params[:administrator_id]),
{ prompt: t("admin.spending_proposals.index.administrator_filter_all"),
label: false,
class: "js-submit-on-change" } %>
</div>
<div class="small-12 medium-4 column float-right">
<div class="small-12 medium-4 column">
<%= select_tag :geozone_id,
options_for_select(geozone_select_options.unshift([t("geozones.none"), "all"]), params[:geozone_id]),
{ prompt: t("admin.spending_proposals.index.geozone_filter_all"),
label: false,
class: "js-submit-on-change" } %>
</div>
<div class="small-12 medium-4 column float-right">
<%= select_tag :administrator_id,
options_for_select(admin_select_options, params[:administrator_id]),
{ prompt: t("admin.spending_proposals.index.administrator_filter_all"),
label: false,
class: "js-submit-on-change" } %>
<div class="small-12 medium-4 column">
<%= select_tag :tag_name,
options_for_select(spending_proposal_tags_select_options, params[:tag_name]),
{ prompt: t("admin.spending_proposals.index.tags_filter_all"),
label: false,
class: "js-submit-on-change" } %>
</div>
<% end %>
</div>
@@ -41,23 +41,16 @@
</td>
<td class="small">
<% if spending_proposal.administrator.present? %>
<span title="<%= t('admin.spending_proposals.index.admin_assigned') %>"><%= spending_proposal.administrator.name %></span>
<span title="<%= t('admin.spending_proposals.index.assigned_admin') %>"><%= spending_proposal.administrator.name %></span>
<% else %>
<%= t("admin.spending_proposals.index.no_admin_assigned") %>
<% end %>
</td>
<td class="small">
<% case spending_proposal.valuators.size %>
<% when 0 %>
<% if spending_proposal.valuators.size == 0 %>
<%= t("admin.spending_proposals.index.no_valuators_assigned") %>
<% when 1 %>
<span title="<%= t('admin.spending_proposals.index.valuators_assigned', count: 1) %>">
<%= spending_proposal.valuators.first.name %>
</span>
<% else %>
<span title="<%= spending_proposal.valuators.map(&:name).join(', ') %>">
<%= t('admin.spending_proposals.index.valuators_assigned', count: spending_proposal.valuators.size) %>
</span>
<%= spending_proposal.valuators.collect(&:name).join(', ') %>
<% end %>
</td>
<td class="small">