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

Merge branch 'master' into tracking_user_verifications_and_others

Browse Source 
Conflicts:
	app/controllers/admin/stats_controller.rb
	db/dev_seeds.rb
This commit is contained in:
palomahnhp
2016-04-20 11:44:33 +02:00
parent b4ec077f16 63c24c15ce
commit bf5d253e12
134 changed files with 2193 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/verification/sms/new.html.erb
View File

@@ -29,9 +29,10 @@
<%= render "shared/errors", resource: @sms %>
<div class="small-12 medium-6">
<%= f.label t("verification.sms.new.phone") %>
<%= f.label :phone, t("verification.sms.new.phone"), class: "inline-block" %>
<span class="inline-block"><%= t("verification.sms.new.phone_format_html") %></span>
<p class="note"><%= t("verification.sms.new.phone_note") %></p>
<%= f.text_field :phone, label: false %>
<%= f.text_field :phone, label: false, placeholder: t("verification.sms.new.phone_placeholder") %>
</div>
<%= f.submit t("verification.sms.new.submit_button"), class: "button success" %>