Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: Continue to Discourse links are now buttons, and those pages will redirect automatically after 5 seconds

This commit is contained in:
Neil Lalonde 2014-07-23 12:32:06 -04:00
parent b29b94046c
commit b4ad70d767
5 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/views/users/_auto_redirect_home.html.erb Normal file
View File

@ -0,0 +1,7 @@
<script language="javascript">
(function() {
setTimeout(function() {
window.location.href = '/';
}, 5000);
})();
</script>

8
app/views/users/authorize_email.html.erb
View File

@ -5,8 +5,8 @@
</div> </div>
<%else%> <%else%>
<h2><%= t 'change_email.confirmed' %></h2> <h2><%= t 'change_email.confirmed' %></h2>
<p> <br>
<%= raw t('change_email.please_continue', link: link_to(SiteSetting.title, '/')) %> <a class="btn" href="/"><%= t('change_email.please_continue', site_name: SiteSetting.title) %></a>
</p> <%= render partial: 'auto_redirect_home' %>
<%end%> <%end%>
</div> </div>

5
app/views/users/password_reset.html.erb
View File

@ -18,7 +18,10 @@
<%- if @requires_approval %> <%- if @requires_approval %>
<%= t 'login.not_approved' %> <%= t 'login.not_approved' %>
<% else %> <% else %>
<%= link_to( t('password_reset.continue', site_name: SiteSetting.title), '/' ) %> <br>
<br>
<a class="btn" href="/"><%= t('password_reset.continue', site_name: SiteSetting.title) %></a>
<%= render partial: 'auto_redirect_home' %>
<% end %> <% end %>
</p> </p>
<% else %> <% else %>

13
app/views/users/perform_account_activation.html.erb
View File

@ -6,15 +6,14 @@
</div> </div>
<%else%> <%else%>
<h2><%= t 'activation.welcome_to', site_name: SiteSetting.title %></h2> <h2><%= t 'activation.welcome_to', site_name: SiteSetting.title %></h2>
<p> <br>
<% if @needs_approval %> <% if @needs_approval %>
<%= t 'activation.approval_required' %> <p><%= t 'activation.approval_required' %></p>
<% else %> <% else %>
<br> <p><%= t('activation.please_continue') %></p>
<%= raw t('activation.please_continue', link: link_to(SiteSetting.title, '/')) %></a>. <p><a class="btn" href="/"><%= t('activation.continue_button', site_name: SiteSetting.title) -%></a></p>
<%= render partial: 'auto_redirect_home' %>
<% end %> <% end %>
</p>
<%end%> <%end%>
</div> </div>

5
config/locales/server.en.yml
View File

@ -389,13 +389,14 @@ en:
change_email: change_email:
confirmed: "Your email has been updated." confirmed: "Your email has been updated."
please_continue: "Please continue to %{link}" please_continue: "Continue to %{site_name}"
error: "There was an error changing your email address. Perhaps the address is already in use?" error: "There was an error changing your email address. Perhaps the address is already in use?"
activation: activation:
action: "Activate your account" action: "Activate your account"
already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?" already_done: "Sorry, this account confirmation link is no longer valid. Perhaps your account is already active?"
please_continue: "Your new account is confirmed, and you are now logged in. Continue to %{link}" please_continue: "Your new account is confirmed, and you are now logged in."
continue_button: "Continue to %{site_name}"
welcome_to: "Welcome to %{site_name}!" welcome_to: "Welcome to %{site_name}!"
approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!" approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!"