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

merges master and fixes conflicts

Browse Source
This commit is contained in:
kikito
2015-08-17 02:40:11 +02:00
parent 543f718891 8c6081c163
commit 8ca546a431
220 changed files with 14524 additions and 17665 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,57 +1,51 @@
<div class="row account">
<div class="small-12 medium-9 column">
<h1><%= t("account.show.title") %></h1>
<div class="small-12 column">
<%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: 'button radius small secondary right' %>
<h1 class="inline-block"><%= t("account.show.title") %></h1>
<%= form_for @account, as: :account, url: account_path do |f| %>
<% if @account.errors.any? %>
<div id="error_explanation" class="alert-box alert radius">
<p><strong><%= pluralize(@account.errors.count, t("debates.form.error"), t("debates.form.errors")) %> <%= t("debates.form.not_saved") %></strong></p>
<ul>
<% @account.errors.full_messages.each do |message| %>
<li><%= message %></li>
<% end %>
</ul>
</div>
<% end %>
<%= render 'shared/errors', resource: @account %>
<div class="row">
<div class="small-12 medium-6 column">
<%= f.label :first_name, t("account.show.first_name_label") %>
<%= f.text_field :first_name, placeholder: t("account.show.first_name_label") %>
</div>
<h2><%= t("account.show.personal")%></h2>
<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") %>
</div>
<% if @account.organization? %>
<div class="small-12 medium-6 column">
<%= f.label :nickname, t("account.show.nickname_label") %>
<%= f.text_field :nickname, placeholder: t("account.show.nickname_label") %>
<%= f.label :use_nickname do %>
<%= f.check_box :use_nickname %>
<%= f.fields_for :organization do |fo| %>
<%= fo.text_field :name, autofocus: true, placeholder: t("account.show.organization_name_label") %>
<% end %>
<% else %>
<%= f.text_field :first_name, placeholder: t("account.show.first_name_label") %>
<%= f.text_field :last_name, placeholder: t("account.show.last_name_label") %>
<%= f.text_field :nickname, placeholder: t("account.show.nickname_label") %>
<%= f.check_box :use_nickname, label: false %>
<span class="checkbox"><%= t("account.show.use_nickname_label") %></span>
<% end %>
<%= f.text_field :phone_number, placeholder: t("account.show.phone_number_label") %>
</div>
<div class="small-12 medium-6 column">
<%= f.label :last_name, t("account.show.phone_number_label") %>
<%= f.text_field :phone_number, placeholder: t("account.show.phone_number_label") %>
</div>
<h2><%= t("account.show.avatar")%></h2>
<%= avatar_image(@account, size: 100) %>
<div class="small-12 column">
<%= f.label :email_on_debate_comment do %>
<%= f.check_box :email_on_debate_comment %>
<h2><%= t("account.show.notifications")%></h2>
<div>
<%= f.check_box :email_on_debate_comment, label: false %>
<span class="checkbox"><%= t("account.show.email_on_debate_comment_label") %></span>
<% end %>
</div>
</div>
<div class="small-12 column">
<%= f.label :email_on_comment_reply do %>
<%= f.check_box :email_on_comment_reply %>
<div>
<%= f.check_box :email_on_comment_reply, label: false %>
<span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
<% end %>
</div>
</div>
<div class="small-12 column">
@@ -59,9 +53,6 @@
</div>
</div>
<% end %>
</div>
<div class="small-12 medium-3 column text-center">
<%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: 'button radius small secondary' %>
</div>
</div>