Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions components/account/activation_check.htm
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{% if not user.is_activated %}

<h3>Your email address has not yet been verified.</h3>
<h3>{# Your email address has not yet been verified. #}{{ 'rainlab.user::lang.account.activation_pending_title' | trans }}</h3>
<p>
You should verify your account otherwise it may be deleted. Please check your email to verify.
<a href="javascript:;" data-request="onSendActivationEmail">Send the verification email again</a>.
{# You should verify your account otherwise it may be deleted. Please check your email to verify. #}{{ 'rainlab.user::lang.account.activation_pending_description' | trans }}
<a href="javascript:;" data-request="onSendActivationEmail">{# Send the verification email again #}{{ 'rainlab.user::lang.account.activation_send_again' | trans }}</a>.
</p>

{% endif %}
17 changes: 9 additions & 8 deletions components/account/deactivate_link.htm
Original file line number Diff line number Diff line change
@@ -1,28 +1,29 @@
<a
href="javascript:;"
onclick="$('#accountDeactivateForm').toggle()">
Deactivate account
{# Deactivate account #}{{ 'rainlab.user::lang.account.deactivation_label' | trans }}
</a>

<div id="accountDeactivateForm" style="display: none">
{{ form_ajax('onDeactivate') }}
<hr />
<h3>Deactivate your account?</h3>
<p>
Your account will be disabled and your details removed from the site.
You can reactivate your account any time by signing back in.
<h3>{# Deactivate your account? #}{{ 'rainlab.user::lang.account.deactivation_title' | trans }}</h3>
<p>{#
Your account will be disabled and your details removed from the site.
You can reactivate your account any time by signing back in.
#}{{ 'rainlab.user::lang.account.deactivation_description' | trans }}
</p>
<div class="form-group">
<label for="accountDeletePassword">To continue, please enter your password:</label>
<label for="accountDeletePassword">{# To continue, please enter your password: #}{{ 'rainlab.user::lang.account.type_password_to_continue' | trans }}</label>
<input name="password" type="password" class="form-control" id="accountDeletePassword" />
</div>
<button type="submit" class="btn btn-danger">
Confirm Deactivate Account
{# Confirm Deactivate Account #}{{ 'rainlab.user::lang.account.deactivation_confirm' | trans }}
</button>
<a
href="javascript:;"
onclick="$('#accountDeactivateForm').toggle()">
I changed my mind
{# I changed my mind #}{{ 'rainlab.user::lang.account.deactivation_cancel' | trans }}
</a>
{{ form_close() }}
</div>
2 changes: 1 addition & 1 deletion components/account/default.htm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="row">

<div class="col-md-6">
<h3>Sign in</h3>
<h3>{# Sign In #}{{ 'rainlab.user::lang.account.sign_in' | trans }}</h3>
{% partial __SELF__ ~ '::signin' %}
</div>

Expand Down
20 changes: 10 additions & 10 deletions components/account/register.htm
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
{% if canRegister %}
<h3>Register</h3>
<h3>{# Register #}{{ 'rainlab.user::lang.account.register' | trans }}</h3>

{{ form_ajax('onRegister') }}

<div class="form-group">
<label for="registerName">Full Name</label>
<label for="registerName">{# Full Name #}{{ 'rainlab.user::lang.account.full_name' | trans }}</label>
<input
name="name"
type="text"
class="form-control"
id="registerName"
placeholder="Enter your full name" />
placeholder="{# Enter your full name #}{{ 'rainlab.user::lang.account.full_name_placeholder' | trans }}" />
</div>

<div class="form-group">
<label for="registerEmail">Email</label>
<label for="registerEmail">{# Email #}{{ 'rainlab.user::lang.account.email' | trans }}</label>
<input
name="email"
type="email"
class="form-control"
id="registerEmail"
placeholder="Enter your email" />
placeholder="{# Enter your email #}{{ 'rainlab.user::lang.account.email_placeholder' | trans }}" />
</div>

{% if loginAttribute == "username" %}
<div class="form-group">
<label for="registerUsername">Username</label>
<label for="registerUsername">{# Username #}{{ 'rainlab.user::lang.user.username' | trans }}</label>
<input
name="username"
type="text"
class="form-control"
id="registerUsername"
placeholder="Enter your username" />
placeholder="{# Enter your username #}{{ 'rainlab.user::lang.account.username_placeholder' | trans }}" />
</div>
{% endif %}

<div class="form-group">
<label for="registerPassword">Password</label>
<label for="registerPassword">{# Password #}{{ 'rainlab.user::lang.account.password' | trans }}</label>
<input
name="password"
type="password"
class="form-control"
id="registerPassword"
placeholder="Choose a password" />
placeholder="{# Choose a password #}{{ 'rainlab.user::lang.account.choose_password_placeholder' | trans }}" />
</div>

<button type="submit" class="btn btn-default">Register</button>
<button type="submit" class="btn btn-default">{# Register #}{{ 'rainlab.user::lang.account.register' | trans }}</button>

{{ form_close() }}
{% else %}
Expand Down
10 changes: 5 additions & 5 deletions components/account/signin.htm
Original file line number Diff line number Diff line change
Expand Up @@ -7,27 +7,27 @@
type="text"
class="form-control"
id="userSigninLogin"
placeholder="Enter your {{ loginAttributeLabel|lower }}" />
placeholder="{# Enter your username/email #}{{ ('rainlab.user::lang.account.' ~ loginAttribute ~ '_placeholder') | trans }}" />
</div>

<div class="form-group">
<label for="userSigninPassword">Password</label>
<label for="userSigninPassword">{# Password #}{{ 'rainlab.user::lang.account.password' | trans }}</label>
<input
name="password"
type="password"
class="form-control"
id="userSigninPassword"
placeholder="Enter your password" />
placeholder="{# Enter your password #}{{ 'rainlab.user::lang.account.password_placeholder' | trans }}" />
</div>

{% if rememberLoginMode == 'ask' %}
<div class="form-group">
<div class="checkbox">
<label><input name="remember" type="checkbox" value="1">Stay logged in</label>
<label><input name="remember" type="checkbox" value="1">{# Stay logged in #}{{ 'rainlab.user::lang.account.stay_logged_in' | trans }}</label>
</div>
</div>
{% endif %}

<button type="submit" class="btn btn-default">Sign in</button>
<button type="submit" class="btn btn-default">{# Sign in #}{{ 'rainlab.user::lang.account.sign_in' | trans }}</button>

{{ form_close() }}
13 changes: 7 additions & 6 deletions components/account/update.htm
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
{{ 'rainlab.user::lang.account.required' | trans | lower }}
{{ form_ajax('onUpdate') }}

<div class="form-group">
<label for="accountName">Full Name</label>
<label for="accountName">{# Full Name #}{{ 'rainlab.user::lang.account.full_name' | trans }}</label>
<input name="name" type="text" class="form-control" id="accountName" value="{{ user.name }}">
</div>

<div class="form-group">
<label for="accountEmail">Email</label>
<label for="accountEmail">{# Email #}{{ 'rainlab.user::lang.account.email' | trans }}</label>
<input name="email" type="email" class="form-control" id="accountEmail" value="{{ user.email }}">
</div>

<div class="form-group">
<label for="accountPassword">New Password</label>
<label for="accountPassword">{# New Password #}{{ 'rainlab.user::lang.account.new_password' | trans }}</label>
<input name="password" type="password" class="form-control" id="accountPassword">
</div>

<div class="form-group">
<label for="accountPasswordConfirm">Confirm New Password</label>
<label for="accountPasswordConfirm">{# Confirm New Password #}{{ 'rainlab.user::lang.account.new_password_confirm' | trans }}</label>
<input name="password_confirmation" type="password" class="form-control" id="accountPasswordConfirm">
</div>

{% if updateRequiresPassword %}
<p>To change these details, please confirm your current password.</p>
<div class="form-group">
<label for="accountPasswordCurrent">Current Password <small class="text-danger">* required</small></label>
<label for="accountPasswordCurrent">Current Password <small class="text-danger">* {# required #}{{ 'rainlab.user::lang.account.required' | trans | lower }}</small></label>
<input name="password_current" type="password" class="form-control" id="accountPasswordCurrent">
</div>
{% endif %}

<button type="submit" class="btn btn-default">Save</button>
<button type="submit" class="btn btn-default">{# Save #}{{ 'backend::lang.form.save' | trans }}</button>

{{ form_close() }}
2 changes: 1 addition & 1 deletion components/resetpassword/complete.htm
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p>Password reset complete, you may now sign in.</p>
<p>{# Password reset complete, you may now sign in. #}{{ 'rainlab.user::lang.reset_password.reset_password_complete' | trans }}</p>
12 changes: 6 additions & 6 deletions components/resetpassword/reset.htm
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
<p class="lead">
Please check your email for the activation code.
{# Please check your email for the activation code. #}{{ 'rainlab.user::lang.reset_password.activation_check_notice' | trans }}
</p>

<form
data-request="{{ __SELF__ }}::onResetPassword"
data-request-update="'{{ __SELF__ }}::complete': '#partialUserResetForm'">
<div class="form-group">
<label for="resetCode">Activation Code</label>
<input name="code" type="text" class="form-control" id="resetCode" placeholder="Enter the activation code" value="{{ __SELF__.code }}">
<label for="resetCode">{# Activation Code #}{{ 'rainlab.user::lang.reset_password.activation_code' | trans }}</label>
<input name="code" type="text" class="form-control" id="resetCode" placeholder="{# Enter the activation code #}{{ 'rainlab.user::lang.reset_password.activation_code_placeholder' | trans }}" value="{{ __SELF__.code }}">
</div>

<div class="form-group">
<label for="resetPassword">New Password</label>
<input name="password" type="password" class="form-control" id="resetPassword" placeholder="Enter a new password">
<label for="resetPassword">{# New Password #}{{ 'rainlab.user::lang.account.new_password' | trans }}</label>
<input name="password" type="password" class="form-control" id="resetPassword" placeholder="{# Enter a new password #}{# New Password #}{{ 'rainlab.user::lang.account.new_password_placeholder' | trans }}">
</div>

<button type="submit" class="btn btn-default">Reset password</button>
<button type="submit" class="btn btn-default">{# Reset Password #}{{ 'rainlab.user::lang.reset_password.reset_password' | trans }}</button>
</form>
9 changes: 5 additions & 4 deletions components/resetpassword/restore.htm
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<p class="lead">
<strong>Lost your password?</strong> No problem! Enter your email address to verify your account.
<strong>{# Lost your password? #}{{ 'rainlab.user::lang.reset_password.reset_password_title' | trans }}</strong>
{# No problem! Enter your email address to verify your account. #}{{ 'rainlab.user::lang.reset_password.reset_password_description' | trans }}
</p>

<form
data-request="{{ __SELF__ }}::onRestorePassword"
data-request-update="'{{ __SELF__ }}::reset': '#partialUserResetForm'">
<div class="form-group">
<label for="userRestoreEmail">Email</label>
<input name="email" type="email" class="form-control" id="userRestoreEmail" placeholder="Enter your email">
<label for="userRestoreEmail">{# Email #}{{ 'rainlab.user::lang.account.email' | trans }}</label>
<input name="email" type="email" class="form-control" id="userRestoreEmail" placeholder="{# Enter your email #}{{ 'rainlab.user::lang.account.email_placeholder' | trans }}">
</div>

<button type="submit" class="btn btn-default">Restore password</button>
<button type="submit" class="btn btn-default">{# Restore password #}{{ 'rainlab.user::lang.reset_password.restore_password' | trans }}</button>
</form>
30 changes: 27 additions & 3 deletions lang/en/lang.php
Original file line number Diff line number Diff line change
Expand Up @@ -190,16 +190,40 @@
'email' => 'Email',
'password' => 'Password',
'login' => 'Login',
'username_placeholder' => 'Enter your username',
'email_placeholder' => 'Enter your email',
'full_name_placeholder' => 'Enter your full name',
'password_placeholder' => 'Enter your password',
'choose_password_placeholder' => 'Choose a password',
'new_password' => 'New Password',
'new_password_placeholder' => 'Enter a new password',
'new_password_confirm' => 'Confirm New Password',
'update_requires_password' => 'Confirm password on update',
'update_requires_password_comment' => 'Require the current password of the user when changing their profile.'
'update_requires_password_comment' => 'Require the current password of the user when changing their profile.',
'stay_logged_in' => 'Stay logged in',
'required' => 'Required',
'type_password_to_continue' => 'To continue, please enter your password:',
'activation_pending_title' => 'Your email address has not yet been verified.',
'activation_pending_description' => 'You should verify your account otherwise it may be deleted. Please check your email to verify.',
'activation_send_again' => 'Send the verification email again',
'deactivation_label' => 'Deactivate account',
'deactivation_title' => 'Deactivate your account?',
'deactivation_description' => 'Your account will be disabled and your details removed from the site. You can reactivate your account any time by signing back in.',
'deactivation_confirm' => 'Confirm Deactivate Account',
'deactivation_cancel' => 'I changed my mind'
],
'reset_password' => [
'reset_password' => 'Reset Password',
'reset_password_desc' => 'Forgotten password form.',
'code_param' => 'Reset Code Param',
'code_param_desc' => 'The page URL parameter used for the reset code'
'code_param_desc' => 'The page URL parameter used for the reset code',
'reset_password_complete' => 'Password reset complete, you may now sign in.',
'activation_code' => 'Activation code',
'activation_code_placeholder' => 'Enter the activation code',
'activation_check_notice' => 'Please check your email for the activation code.',
'reset_password_title' => 'Lost your password?',
'reset_password_description' => 'No problem! Enter your email address to verify your account.',
'restore_password' => 'Restore password'
],
'session' => [
'session' => 'Session',
Expand All @@ -215,5 +239,5 @@
'redirect_desc' => 'Page name to redirect if access is denied.',
'logout' => 'You have been successfully logged out!',
'stop_impersonate_success' => 'You are no longer impersonating a user.',
]
],
];