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

Improves styles for budget index and show views

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2016-06-07 19:22:15 +02:00
parent 8cc2cd0eb1
commit 0899a0ddb4
7 changed files with 143 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -218,6 +218,10 @@ a {
float: left;
}
.table-fixed {
table-layout: fixed;
}
// 02. Header
// ----------

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

@@ -5,6 +5,7 @@
// 03. Show participation
// 04. List participation
// 05. Featured
// 06. Budget
//
// 01. Votes and supports
@@ -1028,3 +1029,15 @@
}
}
}
// 06. Budget
// ----------
.expanded.budget {
background: $budget;
h1, p, a {
color: white;
}
}

38
app/views/budgets/index.html.erb
View File

@@ -1,10 +1,30 @@
<h1>Budget Index</h1>
<div class="expanded budget no-margin-top padding">
<div class="row">
<div class="small-12 column">
<h1><%= t('budget.index.title') %></h1>
</div>
</div>
</div>
<ul>
<% @budgets.each do |budget| %>
<li><%= link_to budget do %>
<%= budget.name %>,
<%= budget.phase %>
<% end %></li>
<% end %>
</ul>
<div class="row margin-top">
<div class="small-12 medium-6 column">
<table class="table-fixed">
<thead>
<th><%= t('budget.index.name') %></th>
<th><%= t('budget.index.phase') %></th>
</thead>
<tbody>
<% @budgets.each do |budget| %>
<tr>
<td>
<%= link_to budget.name, budget %>
</td>
<td>
<%= budget.phase %>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>

53
app/views/budgets/show.html.erb
View File

@@ -1,15 +1,40 @@
<h1><%= @budget.name %></h1>
<div class="expanded budget no-margin-top padding">
<div class="row">
<div class="small-12 medium-9 column">
<%= render 'shared/back_link' %>
<h1><%= @budget.name %></h1>
<p><%= @budget.description %></p>
</div>
</div>
</div>
<div><%= @budget.description %></div>
<ul>
<li><%= link_to budget_investments_path(budget_id: @budget.id, heading_id: nil) do %>
No heading (<%= format_price(@budget, @budget.price) %>)
<% end %></li>
<% @budget.headings.each do |heading| %>
<li><%= link_to budget_investments_path(budget_id: @budget.id, heading_id: heading.id) do %>
<%= heading.name %> (<%= format_price(@budget, heading.price) %>)
<% end %>
</li>
<% end %>
</ul>
<div class="row margin-top">
<div class="small-12 medium-6 column">
<table class="table-fixed">
<thead>
<th><%= t('budget.show.heading') %></th>
<th><%= t('budget.show.price') %></th>
</thead>
<tbody>
<tr>
<td>
<%= link_to t('budget.show.no_heading'), budget_investments_path(budget_id: @budget.id, heading_id: nil) %>
</td>
<td>
<%= format_price(@budget, @budget.price) %>
</td>
</tr>
<% @budget.headings.each do |heading| %>
<tr>
<td>
<%= link_to heading.name, budget_investments_path(budget_id: @budget.id, heading_id: heading.id) %>
</td>
<td>
<%= format_price(@budget, heading.price) %>
</td>
</tr>
<% end %>
</tbody>
</table>
</div>
</div>

8
config/locales/en.yml
View File

@@ -422,6 +422,10 @@ en:
headings:
none: Whole City
all: All scopes
index:
name: Budget's name
phase: Phase
title: Participatory budgets
investments:
form:
association_name_label: 'If you propose in name of an assocation or collective add the name here'
@@ -497,6 +501,10 @@ en:
header:
check_ballot: Check my ballot
different_heading_active: You have active votes in another district.
show:
heading: Heading
price: Price
no_heading: No Heading
spending_proposals:
form:
association_name_label: 'If you propose in name of an assocation or collective add the name here'

8
config/locales/es.yml
View File

@@ -422,6 +422,10 @@ es:
headings:
none: Toda la ciudad
all: Todos los ámbitos
index:
name: Nombre del presupuesto
phase: Fase
title: Presupuestos participativos
investments:
form:
association_name_label: 'Si propones en nombre de una asociación o colectivo añade el nombre aquí'
@@ -497,6 +501,10 @@ es:
header:
check_ballot: Revisar mis votos
different_heading_active: Ya apoyaste propuestas de otro distrito.
show:
heading: Partida
price: Cantidad
no_heading: Sin línea
spending_proposals:
form:
association_name_label: 'Si propones en nombre de una asociación o colectivo añade el nombre aquí'

59
db/schema.rb
View File

@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20160531102008) do
ActiveRecord::Schema.define(version: 20160606102427) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -63,6 +63,21 @@ ActiveRecord::Schema.define(version: 20160531102008) do
add_index "annotations", ["legislation_id"], name: "index_annotations_on_legislation_id", using: :btree
add_index "annotations", ["user_id"], name: "index_annotations_on_user_id", using: :btree
create_table "banners", force: :cascade do |t|
t.string "title", limit: 80
t.string "description"
t.string "target_url"
t.string "style"
t.string "image"
t.date "post_started_at"
t.date "post_ended_at"
t.datetime "hidden_at"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
add_index "banners", ["hidden_at"], name: "index_banners_on_hidden_at", using: :btree
create_table "budget_ballot_lines", force: :cascade do |t|
t.integer "ballot_id"
t.integer "investment_id"
@@ -326,6 +341,15 @@ ActiveRecord::Schema.define(version: 20160531102008) do
add_index "organizations", ["user_id"], name: "index_organizations_on_user_id", using: :btree
create_table "proposal_notifications", force: :cascade do |t|
t.string "title"
t.text "body"
t.integer "author_id"
t.integer "proposal_id"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
end
create_table "proposals", force: :cascade do |t|
t.string "title", limit: 80
t.text "description"
@@ -460,30 +484,30 @@ ActiveRecord::Schema.define(version: 20160531102008) do
add_index "tolk_translations", ["phrase_id", "locale_id"], name: "index_tolk_translations_on_phrase_id_and_locale_id", unique: true, using: :btree
create_table "users", force: :cascade do |t|
t.string "email", default: ""
t.string "encrypted_password", default: "", null: false
t.string "email", default: ""
t.string "encrypted_password", default: "", null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0, null: false
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.string "confirmation_token"
t.datetime "confirmed_at"
t.datetime "confirmation_sent_at"
t.string "unconfirmed_email"
t.boolean "email_on_comment", default: false
t.boolean "email_on_comment_reply", default: false
t.string "phone_number", limit: 30
t.boolean "email_on_comment", default: false
t.boolean "email_on_comment_reply", default: false
t.string "phone_number", limit: 30
t.string "official_position"
t.integer "official_level", default: 0
t.integer "official_level", default: 0
t.datetime "hidden_at"
t.string "sms_confirmation_code"
t.string "username", limit: 60
t.string "username", limit: 60
t.string "document_number"
t.string "document_type"
t.datetime "residence_verified_at"
@@ -494,20 +518,21 @@ ActiveRecord::Schema.define(version: 20160531102008) do
t.datetime "letter_requested_at"
t.datetime "confirmed_hide_at"
t.string "letter_verification_code"
t.integer "failed_census_calls_count", default: 0
t.integer "failed_census_calls_count", default: 0
t.datetime "level_two_verified_at"
t.string "erase_reason"
t.datetime "erased_at"
t.boolean "public_activity", default: true
t.boolean "newsletter", default: true
t.integer "notifications_count", default: 0
t.boolean "registering_with_oauth", default: false
t.boolean "public_activity", default: true
t.boolean "newsletter", default: true
t.integer "notifications_count", default: 0
t.boolean "registering_with_oauth", default: false
t.string "locale"
t.string "oauth_email"
t.integer "geozone_id"
t.string "redeemable_code"
t.string "gender", limit: 10
t.string "gender", limit: 10
t.datetime "date_of_birth"
t.boolean "email_on_proposal_notification", default: true
end
add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree