diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 18ed1be58..ad52cc80c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -138,7 +138,6 @@ div.wrapper { #content { flex-grow: 1; - overflow: hidden; } #sidebar { diff --git a/app/helpers/spaces_helper.rb b/app/helpers/spaces_helper.rb index 4a57101f3..5bc7dd50c 100644 --- a/app/helpers/spaces_helper.rb +++ b/app/helpers/spaces_helper.rb @@ -4,6 +4,14 @@ def spaces_info I18n.t('info.spaces.description') end + def space_tag(resource) + if TeSS::Config.feature['spaces'] && resource.space && !resource.space.default? && resource.space != current_space + content_tag(:span, class: 'label label-info space-tag', style: 'position: absolute; right: -5px; top: -5px;') do + content_tag(:i, '', class: 'fa fa-share-square') + ' ' + resource.space.title + end + end + end + def space_feature_options Space::FEATURES.select do |f| TeSS::Config.feature[f] diff --git a/app/views/collections/_collection.html.erb b/app/views/collections/_collection.html.erb index b757b5ffb..e01bb5a6a 100644 --- a/app/views/collections/_collection.html.erb +++ b/app/views/collections/_collection.html.erb @@ -1,4 +1,5 @@