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

Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others

Browse Source 
Conflicts:
	app/assets/javascripts/application.js
This commit is contained in:
palomahnhp
2016-04-20 11:28:06 +02:00
parent 7d4936b577 1e90e37447
commit b4ec077f16
134 changed files with 712 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
app/views/verification/residence/new.html.erb
View File

@@ -19,7 +19,7 @@
</div>
<%= link_to account_path, class: "back" do %>
<i class="icon-angle-left"></i>
<span class="icon-angle-left"></span>
<%= t("verification.back") %>
<% end %>
@@ -29,10 +29,10 @@
<p><%= t("verification.user_permission_info") %></p>
<ul>
<li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_debates") %></li>
<li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_proposal") %></li>
<li><i class="icon-check"></i>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
<li><i class="icon-x"></i>&nbsp;<%= t("verification.user_permission_votes") %></li>
<li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_debates") %></li>
<li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_proposal") %></li>
<li><span class="icon-check"></span>&nbsp;<%= t("verification.user_permission_support_proposal") %></li>
<li><span class="icon-x"></span>&nbsp;<%= t("verification.user_permission_votes") %></li>
</ul>
</div>
@@ -41,18 +41,32 @@
<div class="row">
<div class="small-12 medium-8">
<div class="small-12 medium-4 column">
<div class="small-12 medium-3 column">
<%= f.label t("verification.residence.new.document_type_label") %>
<%= f.select :document_type, document_types, prompt: "", label: false %>
</div>
<div class="small-12 medium-5 column end">
<%= f.label t("verification.residence.new.document_number") %>
<div class="inline-block">
<%= f.label t("verification.residence.new.document_number") %>
</div>
<div class="inline-block" data-toggle="info-document-number">
<span class="icon-help"></span>
<span class="sr-only"><%= t("verification.residence.new.document_number_help_title") %></span>
</div>
<div class="dropdown-pane" id="info-document-number" data-dropdown
data-hover="true" data-hover-pane="true">
<%= t("verification.residence.new.document_number_help_text_html") %>
</div>
<%= f.text_field :document_number, label: false %>
</div>
</div>
</div>
<div class="date small-12 medium-6 clear">
<div class="date-of-birth small-12 medium-6 clear">
<%= f.label t("verification.residence.new.date_of_birth") %>
<%= f.date_select :date_of_birth,
prompt: true,
@@ -63,23 +77,26 @@
<div class="small-12 medium-5 clear">
<%= f.label t("verification.residence.new.postal_code") %>
<p class="note"><%= t("verification.residence.new.postal_code_note") %></p>
<%= f.text_field :postal_code, label: false %>
<div class="medium-6">
<%= f.text_field :postal_code, label: false %>
</div>
</div>
<div class="small-12">
<%= f.label :terms_of_service do %>
<%= f.check_box :terms_of_service, label: false %>
<%= f.check_box :terms_of_service, title: t('verification.residence.new.accept_terms_text_title'), label: false %>
<span class="checkbox">
<%= t("verification.residence.new.accept_terms_text",
terms_url: link_to(t("verification.residence.new.terms"), "/census_terms",
title: t('shared.target_blank_html'),
target: "_blank")).html_safe
%>
</span>
<% end %>
</div>
<div class="small-12 clear">
<%= f.submit t("verification.residence.new.verify_residence"), class: "button success" %>
<div class="small-12 medium-3 clear">
<%= f.submit t("verification.residence.new.verify_residence"), class: "button success expanded" %>
</div>
<% end %>
</div>