Skip to content

Commit

Permalink
Merge pull request #912 from DaanVanVugt/feature/replace_tess_with_co…
Browse files Browse the repository at this point in the history
…nfig

replace TeSS with config var
  • Loading branch information
fbacall authored Jan 29, 2024
2 parents 50d0816 + 4b98a3d commit b6634c2
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<p>
You are receiving this automated email because you are a curator of TeSS.
You are receiving this automated email because you are a curator of <%= TeSS::Config.site['title_short'] %>.
</p>

<p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
You are receiving this automated email because you are a curator of TeSS.
You are receiving this automated email because you are a curator of <%= TeSS::Config.site['title_short'] %>.

<%= @user.name %> (<%= url_for(@user) %>) has requested approval of an ingestion source:

Expand Down
6 changes: 3 additions & 3 deletions app/views/curation_mailer/user_requires_approval.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<p>
You are receiving this automated email because you are a curator of TeSS.
You are receiving this automated email because you are a curator of <%= TeSS::Config.site['title_short'] %>.
</p>

<p>
<%= @user.name %> has registered an account on TeSS and created the following <%= pluralize(@resources.count, 'resource') -%>:
<%= @user.name %> has registered an account on <%= TeSS::Config.site['title_short'] %> and created the following <%= pluralize(@resources.count, 'resource') -%>:
</p>

<ul>
Expand All @@ -20,7 +20,7 @@
</p>
<ul>
<li><b>Approve</b> - Mark this user as safe, un-hiding their existing and future content.</li>
<li><b>Reject</b> - Mark this user as a spammer, preventing them from creating further content on TeSS.</li>
<li><b>Reject</b> - Mark this user as a spammer, preventing them from creating further content on <%= TeSS::Config.site['title_short'] %>.</li>
</ul>

<%= link_to('Click here to approve or reject this user', curate_users_url(with_content: true)) %>
6 changes: 3 additions & 3 deletions app/views/curation_mailer/user_requires_approval.text.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
You are receiving this automated email because you are a curator of TeSS.
You are receiving this automated email because you are a curator of <%= TeSS::Config.site['title_short'] %>.

<%= @user.name %> has registered an account on TeSS and created the following <%= pluralize(@resources.count, 'resource') -%>:
<%= @user.name %> has registered an account on <%= TeSS::Config.site['title_short'] %> and created the following <%= pluralize(@resources.count, 'resource') -%>:
<% @resources.each do |resource| -%>
* <%= resource.title %> - <%= url_for(resource) %>
URL: <%= resource.respond_to?(:url) ? resource.url : 'n/a'-%>
Expand All @@ -9,7 +9,7 @@ You are receiving this automated email because you are a curator of TeSS.

This user's resources are currently hidden. As a curator, you can decide whether to:
"Approve" - Mark this user as safe, un-hiding their existing and future content.
"Reject" - Mark this user as a spammer, preventing them from creating further content on TeSS.
"Reject" - Mark this user as a spammer, preventing them from creating further content on <%= TeSS::Config.site['title_short'] %>.

To approve or reject this user, please visit:
<%= curate_users_url(with_content: true) %>
2 changes: 1 addition & 1 deletion app/views/devise/registrations/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

<h3>Cancel my account</h3>

<p>Want to leave TeSS? <%= button_to "Delete account", registration_path(resource_name), data: { confirm: "Are you sure you want to delete your account? There is no going back once you perform this action." }, method: :delete, :class => 'btn btn-danger' %></p>
<p>Want to leave <%= TeSS::Config.site['title_short'] %>? <%= button_to "Delete account", registration_path(resource_name), data: { confirm: "Are you sure you want to delete your account? There is no going back once you perform this action." }, method: :delete, :class => 'btn btn-danger' %></p>

</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/devise/shared/_links.html.erb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<ul class="shared-links">
<%- if controller_name != 'sessions' %>
<li>Already on TeSS? <%= link_to 'Log in', new_session_path(resource_name) %></li>
<li>Already on <%= TeSS::Config.site['title_short'] %>? <%= link_to 'Log in', new_session_path(resource_name) %></li>
<% end -%>

<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
<li>New to TeSS? <%= link_to 'Register', new_registration_path(resource_name) %></li>
<li>New to <%= TeSS::Config.site['title_short'] %>? <%= link_to 'Register', new_registration_path(resource_name) %></li>
<% end -%>

<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/static/showcase.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron">
<h1>Theme example</h1>
<p>This is a template showcasing various components with the current TeSS theme applied.</p>
<p>This is a template showcasing various components with the current <%= TeSS::Config.site['title_short'] %> theme applied.</p>
</div>


Expand Down

0 comments on commit b6634c2

Please sign in to comment.