scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-10 00:11:22 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #327 from Ducz0r/lm-sci-747-fix

Browse source 
Remove link to "Resend confirmation instructions" if not neccesary
This commit is contained in:
Luka Murn 2016-11-30 09:14:26 +01:00 • committed by GitHub
commit ac83fe44c7
7 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/users/confirmations/new.html.erb
View file

@ -16,7 +16,7 @@
</div> </div>
<% end %> <% end %>
<%= render "devise/shared/links" %> <%= render "users/shared/links" %>
</div> </div>

2
app/views/users/passwords/edit.html.erb
View file

@ -31,5 +31,5 @@
</div> </div>
<% end %> <% end %>
<%= render "devise/shared/links" %> <%= render "users/shared/links" %>
</div> </div>

2
app/views/users/passwords/new.html.erb
View file

@ -21,5 +21,5 @@
</div> </div>
<% end %> <% end %>
<%= render "devise/shared/links" %> <%= render "users/shared/links" %>
</div> </div>

2
app/views/users/registrations/new.html.erb
View file

@ -45,7 +45,7 @@
</div> </div>
<% end %> <% end %>
<%= render "devise/shared/links" %> <%= render "users/shared/links" %>
</div> </div>
<% if resource and not resource.errors.empty? %> <% if resource and not resource.errors.empty? %>

2
app/views/users/sessions/new.html.erb
View file

@ -30,5 +30,5 @@
</div> </div>
<% end %> <% end %>
<%= render "devise/shared/links" %> <%= render "users/shared/links" %>
</div> </div>

2
app/views/users/shared/_links.html.erb
View file

@ -10,7 +10,7 @@
<%= link_to t("devise.links.forgot"), new_password_path(resource_name) %><br /> <%= link_to t("devise.links.forgot"), new_password_path(resource_name) %><br />
<% end -%> <% end -%>
<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> <%- if Rails.configuration.x.enable_email_confirmations && devise_mapping.confirmable? && controller_name != 'confirmations' %>
<%= link_to t("devise.links.not_receive_confirmation"), new_confirmation_path(resource_name) %><br /> <%= link_to t("devise.links.not_receive_confirmation"), new_confirmation_path(resource_name) %><br />
<% end -%> <% end -%>

2
app/views/users/unlocks/new.html.erb
View file

@ -21,5 +21,5 @@
</div> </div>
<% end %> <% end %>
<%= render "devise/shared/links" %> <%= render "users/shared/links" %>
</div> </div>