Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
18 changed files
with
124 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
<h2>Resend confirmation instructions</h2> | ||
<h2><%= t('devise.confirmations.resend_confirm.head') %></h2> | ||
|
||
<%= form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %> | ||
<%= devise_error_messages! %> | ||
|
||
<div><%= f.label :email %><br /> | ||
<%= f.email_field :email %></div> | ||
|
||
<div><%= f.submit "Resend confirmation instructions" %></div> | ||
<div><%= f.submit t('devise.confirmations.resend_confirm.button') %></div> | ||
<% end %> | ||
<%= render :partial => "devise/shared/links" %> | ||
<%= render :partial => "devise/shared/links" %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,5 @@ | ||
<p>Welcome <%= @resource.email %>!</p> | ||
|
||
<p>You can confirm your account through the link below:</p> | ||
<%= t('devise.mailer.confirmation_instructions.message.html') %> | ||
|
||
<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p> | ||
<p><%= link_to t('devise.mailer.confirmation_instructions.message.link'), confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,7 @@ | ||
<p>Hello <%= @resource.email %>!</p> | ||
|
||
<p>Someone has requested a link to change your password, and you can do this through the link below.</p> | ||
<%= t('devise.mailer.reset_password_instructions.message.html') %> | ||
|
||
<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p> | ||
<p><%= link_to t(devise.mailer.reset_password_instructions.link'), edit_password_url(@resource, :reset_password_token => @token) %></p> | ||
<p>If you didn't request this, please ignore this email.</p> | ||
<p>Your password won't change until you access the link above and create a new one.</p> | ||
<%= t('devise.mailer.reset_password_instructions.note.html') %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
<p>Hello <%= @resource.email %>!</p> | ||
|
||
<p>Your account has been locked due to an excessive amount of unsuccessful sign in attempts.</p> | ||
<%= t('devise.mailer.unlock_instructions.message.html') %> | ||
|
||
<p>Click the link below to unlock your account:</p> | ||
|
||
<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p> | ||
<p><%= link_to t('devise.mailer.unlock_instructions.message.link'), unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,20 +1,20 @@ | ||
<div class="devise"> | ||
|
||
<h2>Change your password</h2> | ||
<h2><%= t('devise.passwords.edit.head')</h2> | ||
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %> | ||
<%= devise_error_messages! %> | ||
<%= f.hidden_field :reset_password_token %> | ||
<div class="form-group"> | ||
<%= f.label :password, "New password", :class => "control-label" %> | ||
<%= f.label :password, t('devise.passwords.edit.new'), :class => "control-label" %> | ||
<%= f.password_field :password, :class => "form-control" %> | ||
</div> | ||
<div class="form-group"> | ||
<%= f.label :password_confirmation, "Confirm new password", :class => "control-label" %> | ||
<%= f.label :password_confirmation, t('devise.passwords.edit.confirm'), :class => "control-label" %> | ||
<%= f.password_field :password_confirmation, :class => "form-control" %> | ||
</div> | ||
<p><%= f.submit "Change my password", :class => "btn btn-primary" %></p> | ||
<p><%= f.submit t('devise.passwords.edit.submit'), :class => "btn btn-primary" %></p> | ||
<% end %> | ||
<p><%= render :partial => "devise/shared/links" %></p> | ||
<p><%= render :partial => "devise/shared/links" %></p> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
<div class="devise"> | ||
<h3 class="heading">Forgot Password?</h3> | ||
<h3 class="heading"><%= t('devise.passwords.new.head')</h3> | ||
<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %> | ||
<%= devise_error_messages! %> | ||
<div class="form-group"> | ||
<%= label_tag :email, "Email", :class => "control-label" %> | ||
<%= label_tag :email, t('devise.passwords.new.email'), :class => "control-label" %> | ||
<%= f.text_field :email, :autofocus => true, :placeholder => 'jsmith@example.com', :class => "form-control" %> | ||
</div> | ||
<p><%= f.submit "Submit", :class => "btn btn-primary" %></p> | ||
<p><%= f.submit t('devise.passwords.new.submit'), :class => "btn btn-primary" %></p> | ||
<% end %> | ||
<p><%= render :partial => "devise/shared/links" %></p> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,32 +1,32 @@ | ||
<div class="devise"> | ||
<h3 class="heading">Register an Account</h3> | ||
<h3 class="heading"><%= t('devise.registrations.register_account') %></h3> | ||
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %> | ||
<%= devise_error_messages! %> | ||
<div class="form-group"> | ||
<%= label_tag :first_name, "First Name", :class => "control-label" %> | ||
<%= label_tag :first_name, t('devise.registrations.first_name'), :class => "control-label" %> | ||
<%= f.text_field :first_name, :class => "form-control", :placeholder => 'John' %> | ||
</div> | ||
<div class="form-group"> | ||
<%= label_tag :last_name, "Last Name", :class => "control-label" %> | ||
<%= label_tag :last_name, t('devise.registrations.last_name'), :class => "control-label" %> | ||
<%= f.text_field :last_name, :class => "form-control", :placeholder => 'Smith' %> | ||
</div> | ||
<div class="form-group"> | ||
<%= label_tag :email, "Email", :class => "control-label" %> | ||
<%= label_tag :email, t('devise.registrations.email'), :class => "control-label" %> | ||
<%= f.email_field :email, :class => "form-control", :placeholder => 'jsmith@example.com' %> | ||
</div> | ||
<div class="form-group"> | ||
<%= label_tag :password, "Username", :class => "control-label" %> | ||
<%= label_tag :password, t('devise.registrations.username'), :class => "control-label" %> | ||
<%= f.text_field :username, :class => "form-control", :placeholder => 'jsmith' %> | ||
</div> | ||
<div class="form-group"> | ||
<%= label_tag :password, "Password", :class => "control-label" %> | ||
<%= label_tag :password, t('devise.registrations.password'), :class => "control-label" %> | ||
<%= f.password_field :password, :class => "form-control", :placeholder => 'Something Memorable!' %> | ||
</div> | ||
<div class="form-group"> | ||
<%= label_tag :password, "Password Confirmation", :class => "control-label" %> | ||
<%= label_tag :password, t('devise.registrations.password_confirmation'), :class => "control-label" %> | ||
<%= f.password_field :password_confirmation, :class => "form-control", :placeholder => 'Something Memorable!' %> | ||
</div> | ||
<p><%= f.submit "Register", :class => "btn btn-primary" %></p> | ||
<p><%= f.submit t('devise.registrations.register'), :class => "btn btn-primary" %></p> | ||
<% end %> | ||
<p><%= render :partial => "devise/shared/links" %></p> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
<div class="devise"> | ||
<h3 class="heading">Sign In</h3> | ||
<h3 class="heading"><%= t('sessions.title') %></h3> | ||
<%= form_for(resource, :as => resource_name, :url => session_path(resource_name), :role => :form) do |f| %> | ||
<div class="form-group"> | ||
<%= label_tag :username, "Username", :class => "control-label" %> | ||
<%= label_tag :username, t('sessions.username'), :class => "control-label" %> | ||
<%= f.text_field :username, :autofocus => true, :placeholder => 'jsmith', :class => "form-control" %> | ||
</div> | ||
<div class="form-group"> | ||
<%= label_tag :password, "Password", :class => "control-label" %> | ||
<%= label_tag :password, t('sessions.password'), :class => "control-label" %> | ||
<%= f.password_field :password, :class => "form-control"%> | ||
</div> | ||
<label class="checkbox"> | ||
<input type="checkbox" value="remember-me"> Remember me | ||
<input type="checkbox" value="remember-me"><%= t('sessions.rememberme') %> | ||
</label> | ||
<%= f.submit "Sign in", :class => "btn btn-primary" %> | ||
<%= f.submit t('sessions.submit'), :class => "btn btn-primary" %> | ||
<% end %> | ||
<%= render :partial => "devise/shared/links" %> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
en: | ||
admin: | ||
site_settings: "Site settings" | ||
max_number_of_rooms: "Max number of rooms" | ||
public_site: "Public site" | ||
disable_connect: "disable connect/disconnect activity" | ||
users_waiting_approval: "Users waiting for approval" | ||
warn_no_user: "There are no users needing approval right now. Invite others to join Kandan!" | ||
warn_no_approved_user: "There are no users. Invite others to join Kandan!" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
en: | ||
main: | ||
admin_console: "Admin console" | ||
edit_account: "Edit Account" | ||
logout: "Logout" | ||
about_kandan: "About Kandan" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
en: | ||
sessions: | ||
title: "Sign In" | ||
username: "Username" | ||
password: "Password" | ||
rememberme: "Remember me" | ||
submit: "Sign in" |