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

Fixes conflicts

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2015-08-08 13:28:29 +02:00
parent fdfef95595 90a3dcdc16
commit c048f25941
38 changed files with 562 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/views/account/show.html.erb
View File

@@ -20,6 +20,7 @@
<%= f.label :first_name, t("account.show.first_name_label") %>
<%= f.text_field :first_name, placeholder: t("account.show.first_name_label") %>
</div>
<div class="small-12 medium-6 column">
<%= f.label :last_name, t("account.show.last_name_label") %>
<%= f.text_field :last_name, placeholder: t("account.show.last_name_label") %>
@@ -34,6 +35,20 @@
<% end %>
</div>
<div class="small-12 column">
<%= f.label :email_on_debate_comment do %>
<%= f.check_box :email_on_debate_comment %>
<span class="checkbox"><%= t("account.show.email_on_debate_comment_label") %></span>
<% end %>
</div>
<div class="small-12 column">
<%= f.label :email_on_comment_reply do %>
<%= f.check_box :email_on_comment_reply %>
<span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
<% end %>
</div>
<div class="small-12 column">
<%= f.submit t("account.show.save_changes_submit"), class: "button radius" %>
</div>