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

improves styles for admin questions views

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-12-14 17:58:21 +01:00
parent 6498d1c34d
commit cbbc3ed1be
7 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/stylesheets/admin.scss
View File

@@ -84,6 +84,11 @@ body.admin {
color: $admin-color; color: $admin-color;
} }
.tabs-panel {
padding-left: 0;
padding-right: 0;
}
#proposals { #proposals {
width: 100% !important; width: 100% !important;
} }
@@ -155,9 +160,11 @@ body.admin {
} }
} }
.admin .tabs-panel { .input-group {
padding-left: 0;
padding-right: 0; .input-group-button {
padding-bottom: rem-calc(16);
}
} }
// 02. Sidebar // 02. Sidebar

15
app/views/admin/poll/questions/_filter.html.erb
View File

@@ -1,8 +1,7 @@
<div class="small-12 medium-6"> <%= form_tag '', method: :get do %>
<%= form_tag '', method: :get do %> <%= label_tag :poll_id, t("admin.questions.index.filter_poll") %>
<%= select_tag "poll_id", <%= select_tag "poll_id",
poll_select_options(true), poll_select_options(true),
prompt: t("admin.questions.index.select_poll"), prompt: t("admin.questions.index.select_poll"),
class: "js-location-changer" %> class: "js-location-changer" %>
<% end %> <% end %>
</div>

14
app/views/admin/poll/questions/_form.html.erb
View File

@@ -7,15 +7,19 @@
<div class="row"> <div class="row">
<div class="small-12 column"> <div class="small-12 column">
<div class="small-12 medium-6"> <div class="small-12 medium-6 large-4">
<%= f.select :poll_id, <%= f.select :poll_id,
options_for_select(Poll.pluck(:name, :id)), options_for_select(Poll.pluck(:name, :id)),
prompt: t("admin.questions.index.select_poll") %> prompt: t("admin.questions.index.select_poll"),
label: t("admin.questions.new.poll_label") %>
</div> </div>
<%= f.text_field :title, maxlength: Poll::Question.title_max_length %> <%= f.text_field :title, maxlength: Poll::Question.title_max_length %>
<%= f.text_field :valid_answers %> <%= f.label :valid_answers %>
<p class="note"><%= t("admin.questions.new.valid_answers_note") %></p>
<%= f.text_field :valid_answers, label: false %>
<%= f.text_area :summary, rows: 4, maxlength: 200 %> <%= f.text_area :summary, rows: 4, maxlength: 200 %>

14
app/views/admin/poll/questions/_search.html.erb
View File

@@ -1,12 +1,10 @@
<%= form_tag(admin_questions_path, method: :get) do |f| %> <%= form_tag(admin_questions_path, method: :get) do |f| %>
<div class="row"> <div class="input-group">
<div class="small-12 medium-6 column"> <%= text_field_tag :search,
<%= text_field_tag :search, @search,
@search, placeholder: t("admin.shared.spending_proposal_search.placeholder") %>
placeholder: t("admin.shared.spending_proposal_search.placeholder") %> <div class="input-group-button">
</div>
<div class="form-inline small-12 medium-3 column end">
<%= submit_tag t("admin.shared.spending_proposal_search.button"), class: "button" %> <%= submit_tag t("admin.shared.spending_proposal_search.button"), class: "button" %>
</div> </div>
</div> </div>
<% end %> <% end %>

13
app/views/admin/poll/questions/index.html.erb
View File

@@ -3,11 +3,18 @@
<%= link_to t('admin.questions.index.create'), new_admin_question_path, <%= link_to t('admin.questions.index.create'), new_admin_question_path,
class: "button success float-right" %> class: "button success float-right" %>
<%= render 'filter' %> <div class="row">
<%= render 'search' %> <div class="small-12 medium-6 column">
<%= render 'search' %>
</div>
</div>
<div class="small-12 medium-4 large-3">
<%= render 'filter' %>
</div>
<% if @questions.count == 0 %> <% if @questions.count == 0 %>
<div class="callout primary"> <div class="callout primary margin-top">
<%= t('admin.questions.index.no_questions') %> <%= t('admin.questions.index.no_questions') %>
</div> </div>
<% else %> <% else %>

3
config/locales/admin.en.yml
View File

@@ -194,11 +194,14 @@ en:
title: "Questions" title: "Questions"
create: "Create question" create: "Create question"
no_questions: "There are no questions." no_questions: "There are no questions."
filter_poll: Filter by Poll
select_poll: Select Poll select_poll: Select Poll
edit: edit:
title: "Edit Question" title: "Edit Question"
new: new:
title: "Create Question" title: "Create Question"
poll_label: "Poll"
valid_answers_note: "Enter the answers separated by commas (,)"
show: show:
proposal: Original proposal proposal: Original proposal
author: Author author: Author

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

@@ -194,11 +194,14 @@ es:
title: "Preguntas ciudadanas" title: "Preguntas ciudadanas"
create: "Crear pregunta ciudadana" create: "Crear pregunta ciudadana"
no_questions: "No hay ninguna pregunta ciudadana." no_questions: "No hay ninguna pregunta ciudadana."
select_poll: Seleccionar votación filter_poll: "Filtrar por votación"
select_poll: "Seleccionar votación"
edit: edit:
title: "Editar pregunta ciudadana" title: "Editar pregunta ciudadana"
new: new:
title: "Crear pregunta ciudadana" title: "Crear pregunta ciudadana"
poll_label: "Votación"
valid_answers_note: "Escribe las respuestas separadas por comas (,)"
show: show:
proposal: Propuesta ciudadana original proposal: Propuesta ciudadana original
author: Autor author: Autor