diff --git a/.gitignore b/.gitignore index 67cb83951..572ac21ba 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ config/secrets.yml config/sunspot.yml config/tess.yml config/ingestion.yml +config/initializers/local_hosts.rb tmp/ solr/test/ solr/pids/ diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 91ebdbc39..0d22fbc5e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -808,6 +808,11 @@ input[type=checkbox].field-lock + label:before, margin: 15px; } +.masonry-brick .space-logo { + padding: .5em; + border-radius: 4px; +} + .list-card { @include floating-card; border-radius: 8px; diff --git a/app/assets/stylesheets/workflows.scss b/app/assets/stylesheets/workflows.scss index 9429638d9..b92e2c19c 100644 --- a/app/assets/stylesheets/workflows.scss +++ b/app/assets/stylesheets/workflows.scss @@ -160,6 +160,11 @@ bottom: 5px; left: 5px; z-index: 20000; + + .space-logo { + padding: .5em; + border-radius: 4px; + } } .nav-heading-darker { diff --git a/app/views/about/us.html.erb b/app/views/about/us.html.erb index f6cfa5980..ee99f9042 100644 --- a/app/views/about/us.html.erb +++ b/app/views/about/us.html.erb @@ -16,9 +16,10 @@
<% TeSS::Config.funders.each do |funder| %> - <% unless funder[:only] && funder[:only] != 'about' %> + <% if (funder[:only].blank? || funder[:only] == 'about') && (funder[:space].blank? || funder[:space] == expected_space) %> <%= link_to(funder[:url], target: '_blank', rel: 'noopener') do -%> <%= image_tag(funder[:logo], class: 'funding-logo') -%> <% end %> diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 939537e2f..966d0451d 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,9 +1,15 @@ +<% space_string_in_config = current_space.default? ? 'default' : current_space.host %> +