consul/grecia
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

100
app/views/users/registrations/new.html.erb
View File

@@ -1,82 +1,36 @@
<div class="row-full auth">
<div class="row">
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<h1 class="text-center"><%= t("devise_views.users.registrations.new.title") %></h1>
<div class="auth row">
<div class="small-12 medium-8 large-5 column small-centered">
<div class="panel">
<h2><%= t("devise_views.users.registrations.new.title") %></h2>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= render 'shared/errors', resource: resource %>
<div class="row">
<div class="small-12 column">
<%= f.text_field :first_name, autofocus: true,
placeholder: t("devise_views.users.registrations.new.first_name_label") %>
<%= f.text_field :last_name, placeholder: t("devise_views.users.registrations.new.last_name_label") %>
<%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label") %>
<%= f.text_field :nickname, placeholder: t("devise_views.users.registrations.new.nickname_label") %>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
<%= f.check_box :use_nickname, label: t("devise_views.users.registrations.new.use_nickname_label") %>
<div class="row">
<div class="small-12 columns">
<%= f.label :first_name, t("devise_views.users.registrations.new.first_name_label") %>
<%= f.text_field :first_name, autofocus: true, placeholder: t("devise_views.users.registrations.new.first_name_label") %>
</div>
</div>
<%= f.text_field :phone_number, placeholder: t("devise_views.users.registrations.new.phone_number_label") %>
<div class="row">
<div class="small-12 columns">
<%= f.label :last_name, t("devise_views.users.registrations.new.last_name_label") %>
<%= f.text_field :last_name, placeholder: t("devise_views.users.registrations.new.last_name_label") %>
</div>
</div>
<%= f.password_field :password, autocomplete: "off",
placeholder: t("devise_views.users.registrations.new.password_label") %>
<div class="row">
<div class="small-12 columns">
<%= f.check_box :use_nickname %>
<%= t("devise_views.users.registrations.new.use_nickname_label") %>
</div>
</div>
<%= f.password_field :password_confirmation, autocomplete: "off",
label: t("devise_views.users.registrations.new.password_confirmation_label"),
placeholder: t("devise_views.users.registrations.new.password_confirmation_label") %>
<div class="row">
<div class="small-12 columns">
<%= f.label :nickname, t("devise_views.users.registrations.new.nickname_label") %>
<%= f.text_field :nickname, placeholder: t("devise_views.users.registrations.new.nickname_label") %>
</div>
</div>
<%= f.simple_captcha input_html: {required: false} %>
<div class="row">
<div class="small-12 columns">
<%= f.label :email, t("devise_views.users.registrations.new.email_label") %>
<%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label") %>
</div>
</div>
<div class="row">
<div class="small-12 columns">
<%= f.label :phone_number, t("devise_views.users.registrations.new.phone_number_label") %>
<%= f.text_field :phone_number, placeholder: t("devise_views.users.registrations.new.phone_number_label") %>
</div>
</div>
<div class="row">
<div class="small-12 columns">
<%= f.label :password, t("devise_views.users.registrations.new.password_label"), class: "inline-block" %>
<% if @minimum_password_length %>
<span class="inline-block"><i><%= t("devise_views.users.registrations.new.min_length", min: @minimum_password_length) %></i></span>
<% end %>
<%= f.password_field :password, autocomplete: "off", placeholder: t("devise_views.users.registrations.new.password_label") %>
</div>
</div>
<div class="row">
<div class="small-12 columns">
<%= f.label :password_confirmation, t("devise_views.users.registrations.new.password_confirmation_label") %>
<%= f.password_field :password_confirmation, autocomplete: "off", placeholder: t("devise_views.users.registrations.new.password_confirmation_label") %>
</div>
</div>
<%= render 'shared/captcha', resource: resource %>
<div class="row">
<div class="small-12 columns">
<%= f.submit t("devise_views.users.registrations.new.submit"), class: "button radius expand" %>
</div>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>
<%= f.submit t("devise_views.users.registrations.new.submit"), class: "button radius expand" %>
</div>
</div>
<% end %>
<%= render "devise/shared/links" %>
</div>
</div>
</div>