lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

Added the ability for admins to send a reset password email for users (#737)

Browse Source
This commit is contained in:
farhatahmad
2019-08-14 10:21:58 -04:00
committed by Jesus Federico
parent 1256554ce6
commit 7e3c44575e
10 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/shared/settings/_account.html.erb
View File

@ -75,6 +75,10 @@
</div>
</div>
<div class="card-footer">
<%= f.submit t("update"), class: "btn btn-primary float-right" %>
<%= f.submit t("update"), class: "btn btn-primary float-right ml-4" %>
<% if can_reset_password %>
<%= link_to "Reset user password", admin_reset_path(user_uid: @user.uid), class: "btn btn-primary float-right" %>
<% end %>
</div>
<% end %>

6
app/views/user_mailer/password_reset.html.erb
View File

@ -24,7 +24,7 @@
</h1>
<p>
<%= t('mailer.user.password_reset.welcome', bigbluebutton: t('bigbluebutton')) %>
<%= t('mailer.user.password_reset.welcome', email: @user.email).html_safe %>
</p>
<p style="margin-bottom:45px;">
@ -38,11 +38,11 @@
</a>
<p style="margin-top:45px;">
<%= t('mailer.user.password_reset.expire') %>
<%= t('mailer.user.password_reset.ignore') %>
</p>
<p>
<%= t('mailer.user.password_reset.ignore') %>
<%= t('mailer.user.password_reset.expire') %>
</p>
</div>
</div>

2
app/views/user_mailer/password_reset.text.erb
View File

@ -18,7 +18,7 @@
<%= t('mailer.user.password_reset.title') %>
<%= t('mailer.user.password_reset.welcome', bigbluebutton: t('bigbluebutton')) %>
<%= t('mailer.user.password_reset.welcome', email: @user.email) %>
<%= t('mailer.user.password_reset.message') %>
<%= @url %>