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

Merge branch 'budgets' into budgets-tags

Browse Source
This commit is contained in:
rgarcia
2017-01-06 18:28:52 +01:00
parent c3380d18fa e2cb390d43
commit 864c703ac4
5 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -805,6 +805,11 @@ form {
.callout {
font-size: $small-font-size;
a {
font-weight: bold;
text-decoration: underline;
}
&.success, &.notice {
background-color: $success-bg;
border-color: $success-border;
@@ -821,12 +826,6 @@ form {
background-color: $warning-bg;
border-color: $warning-border;
color: $color-warning;
a {
color: $color-warning;
font-weight: bold;
text-decoration: underline;
}
}
&.alert, &.error {

2
app/views/budgets/groups/show.html.erb
View File

@@ -29,7 +29,7 @@
</div>
</div>
<div class="medium-5 column show-for-medium text-center margin-top">
<div class="medium-5 column show-for-medium text-center">
<%= image_tag "map.jpg" %>
</div>
</div>

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

@@ -18,12 +18,20 @@
</p>
<% if @budget.accepting? %>
<% if current_user && current_user.level_two_or_three_verified? %>
<%= link_to t("budget.investments.index.sidebar.create"), new_budget_investment_path(@budget), class: "button margin-top" %>
<% if current_user %>
<% if current_user.level_two_or_three_verified? %>
<%= link_to t("budget.investments.index.sidebar.create"), new_budget_investment_path(@budget), class: "button margin-top expanded" %>
<% else %>
<div class="callout warning margin-top">
<%= t("budget.investments.index.sidebar.verified_only",
verify: link_to(t("budget.investments.index.sidebar.verify_account"), verification_path)).html_safe %>
</div>
<% end %>
<% else %>
<div class="callout warning margin-top">
<%= t("budget.investments.index.sidebar.verified_only",
verify: link_to(t("budget.investments.index.sidebar.verify_account"), verification_path)).html_safe %>
<div class="callout primary margin-top">
<%= t("budget.investments.index.sidebar.not_logged_in",
sign_in: link_to(t("budget.investments.index.sidebar.sign_in"), new_user_session_path),
sign_up: link_to(t("budget.investments.index.sidebar.sign_up"), new_user_registration_path)).html_safe %>
</div>
<% end %>
<% end %>

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

@@ -85,6 +85,9 @@ en:
verified_only: "To create a new budget investment %{verify}."
verify_account: "verify your account"
create: "Create budget investment"
not_logged_in: "To create a new budget investment you must %{sign_in} or %{sign_up}."
sign_in: "sign in"
sign_up: "sign up"
orders:
random: random
confidence_score: highest rated

3
config/locales/budgets.es.yml
View File

@@ -85,6 +85,9 @@ es:
verified_only: "Para crear una nueva propuesta de inversión %{verify}."
verify_account: "verifica tu cuenta"
create: "Crear propuesta de inversión"
not_logged_in: "Para crear una nueva propuesta de inversión debes %{sign_in} o %{sign_up}."
sign_in: "iniciar sesión"
sign_up: "registrarte"
orders:
random: Aleatorias
confidence_score: Mejor valoradas