diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 34bca3c62..8260b40db 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -239,12 +239,6 @@ ul.facet-sort-wrap { margin-top: 5px; } -// Bootstrap's row -.row { - margin: 10px 0 10px 0; - //padding: 0px 0px 10px 0px; // Do not add padding to the row - messes up sidebar etc. -} - // From https://css-tricks.com/snippets/css/prevent-long-urls-from-breaking-out-of-container/ .dont-break-out { /* These are technically the same, but use both */ diff --git a/app/views/bans/new.html.erb b/app/views/bans/new.html.erb index 13e4a3452..7002353e1 100644 --- a/app/views/bans/new.html.erb +++ b/app/views/bans/new.html.erb @@ -1,17 +1,15 @@ -
-
-
- <%= page_title('Ban') %> -
-
- <%= simple_form_for [@user, @ban], url: user_ban_path(@user) do |f| %> - <%= f.input :reason %> - <%= f.input :shadow, label: 'Shadowban?' %> -
- <%= f.submit 'Submit', class: 'btn btn-primary' %> - <%= link_to t('.cancel', default: t("helpers.links.cancel")), :back, class: 'btn btn-default' %> -
- <% end %> -
+
+ <%= page_title('Ban') %> +
+
+
+ <%= simple_form_for [@user, @ban], url: user_ban_path(@user) do |f| %> + <%= f.input :reason %> + <%= f.input :shadow, label: 'Shadowban?' %> +
+ <%= f.submit 'Submit', class: 'btn btn-primary' %> + <%= link_to t('.cancel', default: t("helpers.links.cancel")), :back, class: 'btn btn-default' %> +
+ <% end %>
diff --git a/app/views/collections/curate.html.erb b/app/views/collections/curate.html.erb index e1d1d7a66..a173db7c6 100644 --- a/app/views/collections/curate.html.erb +++ b/app/views/collections/curate.html.erb @@ -1,50 +1,49 @@ <%- model_class = Collection -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.curate', 'Curate %{type} in %{model} %{title}'], type: @item_class.table_name, model: model_class.model_name.human.titleize.downcase, title: @collection.title), class: 'col-md-8') %> -
- <%= label_tag :since, t('.new_items_since', default: ['%{count} new items since'], count: @items.length) %> - - <% if @item_class.name == "Event" %> - <%= label_tag :since, t('.show_past', default: ['show past events']) %> - <%= check_box_tag :past, true, @show_past.present?, onchange: "params = new URLSearchParams(window.location.search); this.checked ? params.set('past', true) : params.delete('past'); window.location.search = params.toString();" %> - <% end %> -
+
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.curate', 'Curate %{type} in %{model} %{title}'], type: @item_class.table_name, model: model_class.model_name.human.titleize.downcase, title: @collection.title), class: 'col-md-8') %> +
+ <%= label_tag :since, t('.new_items_since', default: ['%{count} new items since'], count: @items.length) %> + + <% if @item_class.name == "Event" %> + <%= label_tag :since, t('.show_past', default: ['show past events']) %> + <%= check_box_tag :past, true, @show_past.present?, onchange: "params = new URLSearchParams(window.location.search); this.checked ? params.set('past', true) : params.delete('past'); window.location.search = params.toString();" %> + <% end %>
- <%= form_with url: request.url, local: true, method: :patch do |f| %> - - - - - <%- item_fields(@item_class).each do |field| -%> - - <%- end %> - - - - - <% @items.each do |item| %> - <%- id = "item_#{item.id}" %> - - - <%- item_fields(@item_class).each do |field| -%> - - <% end %> - - - <% end %> - -
<%= t field, default: field.to_s.titleize %>
- <%= label_tag id do %> - <%= hidden_field_tag "reviewed_item_ids[]", item.id %> - /> - <% end %> - <%= link_to t('.link', default: [:'helpers.titles.link', 'Link']), item %>
+
+
-
- <%= f.submit class: 'btn btn-primary' %> -
+<%= form_with url: request.url, local: true, method: :patch do |f| %> + + + + + <%- item_fields(@item_class).each do |field| -%> + + <%- end %> + + + + + <% @items.each do |item| %> + <%- id = "item_#{item.id}" %> + + + <%- item_fields(@item_class).each do |field| -%> + + <% end %> + + <% end %> + +
<%= t field, default: field.to_s.titleize %>
+ <%= label_tag id do %> + <%= hidden_field_tag "reviewed_item_ids[]", item.id %> + /> + <% end %> + <%= link_to t('.link', default: [:'helpers.titles.link', 'Link']), item %>
+ +
+ <%= f.submit class: 'btn btn-primary' %>
-
+<% end %> diff --git a/app/views/collections/edit.html.erb b/app/views/collections/edit.html.erb index 32d865aee..7ad680834 100644 --- a/app/views/collections/edit.html.erb +++ b/app/views/collections/edit.html.erb @@ -1,16 +1,12 @@ <%- model_class = Collection -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
-
- <%= render :partial => 'collections/partials/general_collection_info' %> -
-
- <%= render :partial => 'form' %> -
-
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => 'collections/partials/general_collection_info' %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/collections/new.html.erb b/app/views/collections/new.html.erb index b9c8944c8..6dedd0b95 100644 --- a/app/views/collections/new.html.erb +++ b/app/views/collections/new.html.erb @@ -1,17 +1,12 @@ <%- model_class = Collection -%> - -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
-
- <%= render :partial => 'collections/partials/general_collection_info' %> -
-
- <%= render :partial => 'form' %> -
-
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => 'collections/partials/general_collection_info' %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb index b8f212d71..34e128400 100644 --- a/app/views/collections/show.html.erb +++ b/app/views/collections/show.html.erb @@ -21,7 +21,7 @@ <%= delete_button(@collection) if policy(@collection).destroy? %>
-
+
<% materials = @collection.materials %> <% materials_count = @collection.materials.count %> <% events = @collection.events %> diff --git a/app/views/common/_associated_events.html.erb b/app/views/common/_associated_events.html.erb index 39e3c2add..4cfccfb43 100644 --- a/app/views/common/_associated_events.html.erb +++ b/app/views/common/_associated_events.html.erb @@ -12,27 +12,23 @@ <% active = activator.check_pane(id) if activator %>
-
-
-
- Showing <%= pluralize(shown_count, name) -%> - <% all_btn_text = "Filter #{name.pluralize(shown_count)}" %> - <% if limit && total_count > limit %> - out of <%= total_count -%> - <% all_btn_text = "View all #{name.pluralize(shown_count)} & filter" %> - <% end %> - <% if past_count > 0 %> - (also found <%= pluralize(past_count, 'past event') %>) - <% end %> -
- - <% if shown_count > 0 && view_all_link %> - <%= link_to all_btn_text, view_all_link, class: 'btn btn-xs btn-default' %> - <% elsif past_count > 0 && inc_expired_link %> - <%= link_to "View all #{name.pluralize(shown_count)} & filter", inc_expired_link, class: 'btn btn-xs btn-default' %> - <% end %> -
+
+ Showing <%= pluralize(shown_count, name) -%> + <% all_btn_text = "Filter #{name.pluralize(shown_count)}" %> + <% if limit && total_count > limit %> + out of <%= total_count -%> + <% all_btn_text = "View all #{name.pluralize(shown_count)} & filter" %> + <% end %> + <% if past_count > 0 %> + (also found <%= pluralize(past_count, 'past event') %>) + <% end %>
+ <% if shown_count > 0 && view_all_link %> + <%= link_to all_btn_text, view_all_link, class: 'btn btn-xs btn-default' %> + <% elsif past_count > 0 && inc_expired_link %> + <%= link_to "View all #{name.pluralize(shown_count)} & filter", inc_expired_link, class: 'btn btn-xs btn-default' %> + <% end %> + <%= render partial: 'common/masonry_grid', locals: { objects: resources } %>
diff --git a/app/views/common/_associated_resources.html.erb b/app/views/common/_associated_resources.html.erb index 1340e3916..3e0b7030e 100644 --- a/app/views/common/_associated_resources.html.erb +++ b/app/views/common/_associated_resources.html.erb @@ -9,21 +9,17 @@ <% active = activator.check_pane(id) if activator %>
-
-
-
- Showing <%= pluralize(shown_count, name) -%> - <% if limit && total_count > limit %> - out of <%= total_count -%> - <% all_btn_text = 'View all & filter' %> - <% else %> - <% all_btn_text = 'Filter' %> - <% end %> -
- - <%= link_to all_btn_text, view_all_link, class: 'btn btn-xs btn-default' if view_all_link %> -
+
+ Showing <%= pluralize(shown_count, name) -%> + <% if limit && total_count > limit %> + out of <%= total_count -%> + <% all_btn_text = 'View all & filter' %> + <% else %> + <% all_btn_text = 'Filter' %> + <% end %>
+ <%= link_to all_btn_text, view_all_link, class: 'btn btn-xs btn-default' if view_all_link %> + <%= render partial: 'common/masonry_grid', locals: { objects: resources } %>
diff --git a/app/views/common/_external_resource.html.erb b/app/views/common/_external_resource.html.erb index 32aaa6596..88a84ee14 100644 --- a/app/views/common/_external_resource.html.erb +++ b/app/views/common/_external_resource.html.erb @@ -1,5 +1,5 @@ <% api_url = external_resource.api_url_of_tool -%> -<%= content_tag(:div, class: 'col-md-12 col-sm-12 bounding-box', data: { 'biotools-url': api_url }) do %> +<%= content_tag(:div, class: 'bounding-box', data: { 'biotools-url': api_url }) do %> <%= link_to(external_resource.url, target: '_blank', rel: 'nofollow noopener') do %>
diff --git a/app/views/common/_external_resources_list.html.erb b/app/views/common/_external_resources_list.html.erb index 3d78e569d..be5649fd6 100644 --- a/app/views/common/_external_resources_list.html.erb +++ b/app/views/common/_external_resources_list.html.erb @@ -1,4 +1,4 @@ -
+
<% external_resources.each do |external_resource| %> <% unless external_resource.failing? & !current_user&.is_admin? -%> <%= render partial: 'common/external_resource', object: external_resource %> diff --git a/app/views/common/_mixed_resources.html.erb b/app/views/common/_mixed_resources.html.erb index 26a7f13cc..7a612eb7b 100644 --- a/app/views/common/_mixed_resources.html.erb +++ b/app/views/common/_mixed_resources.html.erb @@ -28,13 +28,11 @@
<% if !TeSS::Config.feature['disabled'].include? 'topics' %> -
<%= display_attribute(resource, :scientific_topics) { |values| values.map { |x| "#{x.preferred_label.to_s}" }.join(', ') } %> <%= display_attribute(resource, :keywords) { |values| values.join(', ') } if resource.keywords.any? %> <%= yield %> -
<% end %>
diff --git a/app/views/common/_topic_suggestions.html.erb b/app/views/common/_topic_suggestions.html.erb index efcaad1df..b524ee5ff 100644 --- a/app/views/common/_topic_suggestions.html.erb +++ b/app/views/common/_topic_suggestions.html.erb @@ -2,7 +2,7 @@
<%= link_to(suggestion.material.title, suggestion, class: 'list-card-heading') %> -
+
<%= icon_for(:suggestion, :large) %> diff --git a/app/views/content_providers/edit.html.erb b/app/views/content_providers/edit.html.erb index 25e95ae0e..007cf1857 100644 --- a/app/views/content_providers/edit.html.erb +++ b/app/views/content_providers/edit.html.erb @@ -1,16 +1,12 @@ <%- model_class = ContentProvider -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
-
- <%= render :partial => 'content_providers/partials/general_content_provider_info' %> -
-
- <%= render :partial => 'form' %> -
-
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => 'content_providers/partials/general_content_provider_info' %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/content_providers/new.html.erb b/app/views/content_providers/new.html.erb index ec27e5987..536143ad4 100644 --- a/app/views/content_providers/new.html.erb +++ b/app/views/content_providers/new.html.erb @@ -1,16 +1,12 @@ <%- model_class = ContentProvider -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
-
- <%= render :partial => 'content_providers/partials/general_content_provider_info' %> -
-
- <%= render :partial => 'form' %> -
-
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => 'content_providers/partials/general_content_provider_info' %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/content_providers/show.html.erb b/app/views/content_providers/show.html.erb index 71316ad65..3118710d7 100644 --- a/app/views/content_providers/show.html.erb +++ b/app/views/content_providers/show.html.erb @@ -17,7 +17,7 @@
-
+
<% resource_limit = 30 %> <% materials = @content_provider.materials.from_verified_users.limit(resource_limit) %> <% materials_count = @content_provider.materials.from_verified_users.count %> @@ -65,7 +65,7 @@ <% if policy(@content_provider).update? && TeSS::Config.feature['sources'] %>
<% if policy(Source).new? %> -
+
<%= link_to new_content_provider_source_path(@content_provider), class: 'btn btn-primary' do %> Add source <% end %> @@ -76,9 +76,8 @@
<% end %> -
- <%= render partial: 'common/masonry_grid', locals: { objects: sources } %> -
+ + <%= render partial: 'common/masonry_grid', locals: { objects: sources } %>
<% end %>
diff --git a/app/views/curator/_leaderboard.html.erb b/app/views/curator/_leaderboard.html.erb index 35a7ffb46..657b50532 100644 --- a/app/views/curator/_leaderboard.html.erb +++ b/app/views/curator/_leaderboard.html.erb @@ -6,7 +6,7 @@ <% leaderboard.each do |curator, scores| %>
<% if current_user == curator %> -
+
You have made <%= pluralize scores['total'], 'contribution' %>
<% scores.each do |score, value| %> @@ -20,7 +20,7 @@
<% end %> <% else %> -
+
<%=link_to "#{curator.full_name.blank? ? curator.username : curator.full_name}", curator %> has made <%= pluralize scores['total'], 'contribution' %>
<% end %> diff --git a/app/views/curator/topic_suggestions.html.erb b/app/views/curator/topic_suggestions.html.erb index 1ebb7425a..056721fcc 100644 --- a/app/views/curator/topic_suggestions.html.erb +++ b/app/views/curator/topic_suggestions.html.erb @@ -1,34 +1,23 @@ -
-
-

Displaying all <%= pluralize @suggestions.count, 'topic suggestion' %>

-
- <%= info_button("How to curate topics in #{TeSS::Config.site['title_short']}") do %> - <%= render_markdown(MaterialsHelper::TOPICS_INFO) %> - <% end %> -
+
+ <%= info_button("How to curate topics in #{TeSS::Config.site['title_short']}") do %> + <%= render_markdown(MaterialsHelper::TOPICS_INFO) %> + <% end %>
+

Displaying all <%= pluralize @suggestions.count, 'topic suggestion' %>

<% @suggestions.each do |suggestion| %> - <% resource = suggestion.suggestible %> - <%= render layout: 'common/mixed_resources', locals: {resource: resource} do%> + <% resource = suggestion.suggestible %> + <%= render layout: 'common/mixed_resources', locals: {resource: resource} do%> <%= render partial: 'common/approve_term_suggestions', locals: { suggestion: suggestion } %> - <% end %> + <% end %> <% end %> -
- - - diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb index e3c3e9f53..42db4b4a6 100644 --- a/app/views/devise/registrations/edit.html.erb +++ b/app/views/devise/registrations/edit.html.erb @@ -1,43 +1,41 @@ -
-
- <%- model_class = Profile -%> -
- <%= page_title 'Manage account' %> -
-
- <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> - <%= account_error_messages! %> - - <%= f.input :username, autofocus: true %> - - <%= f.input :email, required: true, label: 'Account email' %> - - <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> -
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
- <% end %> - - <%= f.input :password, input_html: { autocomplete: 'off' }, placeholder: '(unchanged)', - hint: "Leave blank if you don't want to change it." %> - - <%= f.input :password_confirmation, input_html: { autocomplete: 'off' } %> - - <% unless resource.using_omniauth? %> - <%= f.input :current_password, input_html: { autocomplete: 'off' }, required: true, - hint: "We need your current password to confirm changes." %> - <% end %> - -
- <%= f.submit "Update", :class => 'btn btn-primary' %> - <%= link_to 'Regenerate authentication token', change_token_path(resource), :method => :patch, :class => 'btn btn-default', data: { confirm: 'Are you sure want to regenerate your authentication token? Your previous authentication token will no longer work' } %> - <%= link_to "Back", :back, class: 'btn btn-default' %> -
+<%- model_class = Profile -%> +
+ <%= page_title 'Manage account' %> +
+
+
+ <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %> + <%= account_error_messages! %> + + <%= f.input :username, autofocus: true %> + + <%= f.input :email, required: true, label: 'Account email' %> + + <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %> +
Currently waiting confirmation for: <%= resource.unconfirmed_email %>
<% end %> -

Cancel my account

+ <%= f.input :password, input_html: { autocomplete: 'off' }, placeholder: '(unchanged)', + hint: "Leave blank if you don't want to change it." %> + + <%= f.input :password_confirmation, input_html: { autocomplete: 'off' } %> + + <% unless resource.using_omniauth? %> + <%= f.input :current_password, input_html: { autocomplete: 'off' }, required: true, + hint: "We need your current password to confirm changes." %> + <% end %> + +
+ <%= f.submit "Update", :class => 'btn btn-primary' %> + <%= link_to 'Regenerate authentication token', change_token_path(resource), :method => :patch, :class => 'btn btn-default', data: { confirm: 'Are you sure want to regenerate your authentication token? Your previous authentication token will no longer work' } %> + <%= link_to "Back", :back, class: 'btn btn-default' %> +
+ <% end %> + +

Cancel my account

-

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' %>

+

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' %>

-
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 953345393..449245527 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -2,69 +2,62 @@
<%= page_title 'Registration' %>
-
- <% if !TeSS::Config.feature['registration'] %> -
-
-
-

Registration is currently disabled

-
-
-

Please email <%= mail_to(TeSS::Config.contact_email, TeSS::Config.contact_email) %> to request an account.

-

In your email please include the following information:

-
    -
  • Full name
    • -
  • Email address
    • -
  • Institution/Organisation
    • -
  • Brief description of why you would like an account and/or the type of materials/events you would like to add
    • -
-

Sorry for any inconvenience caused,

-

The <%= TeSS::Config.site['title_short'] %> Team

-
-
+ <% if !TeSS::Config.feature['registration'] %> +
+
+

Registration is currently disabled

- <% else %> -
-
- <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> - <%= account_error_messages! %> - - <%= f.input :username, autofocus: true %> - - <%= f.input :email, required: true %> - - <%= f.input :publicize_email, as: :boolean, label: 'Make my email publicly visible' %> +
+

Please email <%= mail_to(TeSS::Config.contact_email, TeSS::Config.contact_email) %> to request an account.

+

In your email please include the following information:

+
    +
  • Full name
    • +
  • Email address
    • +
  • Institution/Organisation
    • +
  • Brief description of why you would like an account and/or the type of materials/events you would like to add
    • +
+

Sorry for any inconvenience caused,

+

The <%= TeSS::Config.site['title_short'] %> Team

+
+
+ <% else %> +
+ <%= simple_form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= account_error_messages! %> - <%= f.input :password, required: true, input_html: { autocomplete: 'off' }, - hint: "(#{@minimum_password_length} characters minimum)" if @minimum_password_length %> + <%= f.input :username, autofocus: true %> - <%= f.input :password_confirmation, required: true, input_html: { autocomplete: 'off' } %> + <%= f.input :email, required: true %> - <% unless Rails.application.secrets.recaptcha[:sitekey].blank? -%> -
- <%= recaptcha_tags ajax: true %> -
- <% end -%> + <%= f.input :publicize_email, as: :boolean, label: 'Make my email publicly visible' %> - <%= f.input :processing_consent, as: :boolean, input_html: { autocomplete: 'off' }, - label: "I have read and understood the #{link_to('privacy policy', privacy_path, target: '_blank')} and consent to #{TeSS::Config.site['title_short']} processing my data.".html_safe %> -
- <%= f.submit "Register", :class => 'btn btn-primary' %> -
- <% end %> + <%= f.input :password, required: true, input_html: { autocomplete: 'off' }, + hint: "(#{@minimum_password_length} characters minimum)" if @minimum_password_length %> -
or
+ <%= f.input :password_confirmation, required: true, input_html: { autocomplete: 'off' } %> -
- <% if resource_class.omniauth_providers.any? && devise_mapping.omniauthable? %> - <%= render partial: 'devise/sessions/omniauth_options' %> - <% end %> + <% unless Rails.application.secrets.recaptcha[:sitekey].blank? -%> +
+ <%= recaptcha_tags ajax: true %>
+ <% end -%> - <%= render "devise/shared/links" %> - + <%= f.input :processing_consent, as: :boolean, input_html: { autocomplete: 'off' }, + label: "I have read and understood the #{link_to('privacy policy', privacy_path, target: '_blank')} and consent to #{TeSS::Config.site['title_short']} processing my data.".html_safe %> +
+ <%= f.submit "Register", :class => 'btn btn-primary' %>
+ <% end %> + +
or
+ +
+ <% if resource_class.omniauth_providers.any? && devise_mapping.omniauthable? %> + <%= render partial: 'devise/sessions/omniauth_options' %> + <% end %>
- <% end %> -
+ + <%= render "devise/shared/links" %> +
+ <% end %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index eb64bb38f..0e0f0845b 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -2,30 +2,26 @@
<%= page_title 'Log in' %>
-
-
-
- <% if resource_class.omniauth_providers.any? && devise_mapping.omniauthable? %> -
<%= t('authentication.omniauth.title') %>
-

<%= t('authentication.omniauth.description') %>

- <%= render partial: 'devise/sessions/omniauth_options' %> -
- <% end %> +
+ <% if resource_class.omniauth_providers.any? && devise_mapping.omniauthable? %> +
<%= t('authentication.omniauth.title') %>
+

<%= t('authentication.omniauth.description') %>

+ <%= render partial: 'devise/sessions/omniauth_options' %> +
+ <% end %> - <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
<%= t('authentication.password.title') %>
-

<%= t('authentication.password.description') %>

- <%= f.input :login, label: 'Email or username', autofocus: true %> - <%= f.input :password, input_html: { autocomplete: 'off' } %> - <% if devise_mapping.rememberable? -%> - <%= f.input :remember_me, as: :boolean %> - <% end -%> -
- <%= f.submit "Log in", :class => 'btn btn-primary' %> -
- <% end %> - <%= render "devise/shared/links" %> + <%= simple_form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> +
<%= t('authentication.password.title') %>
+

<%= t('authentication.password.description') %>

+ <%= f.input :login, label: 'Email or username', autofocus: true %> + <%= f.input :password, input_html: { autocomplete: 'off' } %> + <% if devise_mapping.rememberable? -%> + <%= f.input :remember_me, as: :boolean %> + <% end -%> +
+ <%= f.submit "Log in", :class => 'btn btn-primary' %>
-
+ <% end %> + <%= render "devise/shared/links" %>
diff --git a/app/views/events/edit.html.erb b/app/views/events/edit.html.erb index 8731ef1d5..42c56991f 100644 --- a/app/views/events/edit.html.erb +++ b/app/views/events/edit.html.erb @@ -1,15 +1,13 @@ <%- model_class = Event -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
- <%= render :partial => "events/partials/general_event_info" %> - <%= render :partial => "common/field_lock_info" %> -
-
- <%= render :partial => 'form' %> -
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => "events/partials/general_event_info" %> + <%= render :partial => "common/field_lock_info" %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/events/new.html.erb b/app/views/events/new.html.erb index 7c88130c1..700367d73 100644 --- a/app/views/events/new.html.erb +++ b/app/views/events/new.html.erb @@ -1,15 +1,13 @@ <%- model_class = Event -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
- <%= render :partial => "events/partials/general_event_info" %> - <%= render :partial => "common/field_lock_info" %> -
-
- <%= render :partial => 'form' %> -
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => "events/partials/general_event_info" %> + <%= render :partial => "common/field_lock_info" %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/events/partials/_external_resources.html.erb b/app/views/events/partials/_external_resources.html.erb index c75801472..55e509c80 100644 --- a/app/views/events/partials/_external_resources.html.erb +++ b/app/views/events/partials/_external_resources.html.erb @@ -11,16 +11,12 @@ <% if !TeSS::Config.feature['disabled'].include? 'fairshare' %> -
- <%= render :partial => 'common/fairsharing_suggestions', :locals => { :title_element => 'material_title' } %> -
+ <%= render :partial => 'common/fairsharing_suggestions', :locals => { :title_element => 'material_title' } %> <% end %> <% if !TeSS::Config.feature['disabled'].include? 'biotools' %> -
- <%= render partial: 'common/biotools_suggestions', locals: { title_element: 'event_title' } %> -
+ <%= render partial: 'common/biotools_suggestions', locals: { title_element: 'event_title' } %> <% end %> diff --git a/app/views/events/report.html.erb b/app/views/events/report.html.erb index 34aa6740b..cc9383954 100644 --- a/app/views/events/report.html.erb +++ b/app/views/events/report.html.erb @@ -1,38 +1,36 @@ -
-
-
- <%= page_title('Event report') %> -
-
- <%= info_box('Reports') do %> -

- Reports are a way of recording metrics and information about an event after it has ended. - All fields are optional, and can be amended at any time. -

-

Reports are not publicly visible and can only be accessed by users with "edit" access to the event.

- <% end %> -
-
- <%= simple_form_for @event, url: report_event_path do |f| %> +
+ <%= page_title('Event report') %> +
+
+
+ <%= info_box('Reports') do %> +

+ Reports are a way of recording metrics and information about an event after it has ended. + All fields are optional, and can be amended at any time. +

+

Reports are not publicly visible and can only be accessed by users with "edit" access to the event.

+ <% end %> +
+
+ <%= simple_form_for @event, url: report_event_path do |f| %> - <%= render partial: 'common/error_summary', locals: { resource_name: 'report', resource: @event } %> + <%= render partial: 'common/error_summary', locals: { resource_name: 'report', resource: @event } %> - <%= f.input :funding %> - <%= f.input :applicant_count, label: 'Number of registrations' %> - <%= f.input :attendee_count, label: 'Number of attendees' %> - <%= f.input :trainer_count, label: 'Number of trainers' %> - <%= f.input :feedback %> + <%= f.input :funding %> + <%= f.input :applicant_count, label: 'Number of registrations' %> + <%= f.input :attendee_count, label: 'Number of attendees' %> + <%= f.input :trainer_count, label: 'Number of trainers' %> + <%= f.input :feedback %> -
- <%= f.label :notes %> - <%= f.markdown_area :notes, class: 'form-control', rows: '5' %> -
+
+ <%= f.label :notes %> + <%= f.markdown_area :notes, class: 'form-control', rows: '5' %> +
-
- <%= f.submit 'Submit report', class: 'btn btn-primary' %> - <%= link_to 'Back', :back, class: 'btn btn-default' %> -
- <% end %> -
+
+ <%= f.submit 'Submit report', class: 'btn btn-primary' %> + <%= link_to 'Back', :back, class: 'btn btn-default' %> +
+ <% end %>
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb index 1c4975dbc..4a4509d89 100644 --- a/app/views/events/show.html.erb +++ b/app/views/events/show.html.erb @@ -7,7 +7,7 @@
-
+
<% if @event.event_types.any? %> <% @event.event_types.each do |t| %> @@ -54,7 +54,7 @@
-
+
<%= display_attribute(@event, :start) { |t| t.strftime('%A, %d %B %Y @ %H:%M') }%> <%= display_attribute(@event, :end) { |t| t.strftime('%A, %d %B %Y @ %H:%M') } %> diff --git a/app/views/materials/edit.html.erb b/app/views/materials/edit.html.erb index 3383fe9f6..5b2b1d292 100644 --- a/app/views/materials/edit.html.erb +++ b/app/views/materials/edit.html.erb @@ -1,15 +1,13 @@ <%- model_class = Material -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
- <%= render :partial => "materials/partials/general_material_info" %> - <%= render :partial => "common/field_lock_info" %> -
-
- <%= render :partial => 'form' %> -
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => "materials/partials/general_material_info" %> + <%= render :partial => "common/field_lock_info" %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/materials/new.html.erb b/app/views/materials/new.html.erb index 15fe717c9..c1b36a599 100644 --- a/app/views/materials/new.html.erb +++ b/app/views/materials/new.html.erb @@ -1,15 +1,13 @@ <%- model_class = Material -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
- <%= render :partial => "materials/partials/general_material_info" %> - <%= render :partial => "common/field_lock_info" %> -
-
- <%= render :partial => 'form' %> -
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => "materials/partials/general_material_info" %> + <%= render :partial => "common/field_lock_info" %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/materials/show.html.erb b/app/views/materials/show.html.erb index 90d5c743a..023fdb350 100644 --- a/app/views/materials/show.html.erb +++ b/app/views/materials/show.html.erb @@ -6,7 +6,7 @@
-
+
<%= display_attribute_no_label(@material, :resource_type) { |values| values.join(', ') } %>
diff --git a/app/views/nodes/edit.html.erb b/app/views/nodes/edit.html.erb index e46d0e86e..6f9530563 100644 --- a/app/views/nodes/edit.html.erb +++ b/app/views/nodes/edit.html.erb @@ -1,16 +1,12 @@ <%- model_class = Node -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
-
- <%= render :partial => 'nodes/partials/general_node_info' %> -
-
- <%= render :partial => 'form' %> -
-
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.edit', 'Edit %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => 'nodes/partials/general_node_info' %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/nodes/new.html.erb b/app/views/nodes/new.html.erb index ed2fc0cd1..ddb8ebcb6 100644 --- a/app/views/nodes/new.html.erb +++ b/app/views/nodes/new.html.erb @@ -1,16 +1,12 @@ <%- model_class = Node -%> -
-
-
- <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> -
-
-
- <%= render :partial => 'nodes/partials/general_node_info' %> -
-
- <%= render :partial => 'form' %> -
-
+
+ <%= page_title(t('.title', :default => [:'helpers.titles.new', 'New %{model}'], :model => model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render :partial => 'nodes/partials/general_node_info' %> +
+
+ <%= render :partial => 'form' %>
diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb index 81bd8bb85..37599888b 100644 --- a/app/views/nodes/show.html.erb +++ b/app/views/nodes/show.html.erb @@ -14,13 +14,13 @@ <%= delete_button(@node) if policy(@node).destroy? %>
-
+
<% if @node.content_providers.any? %>

Content Providers

<%= render @node.content_providers %> <% end %>
-
+
<% resource_limit = 30 %> <% materials = @node.materials.limit(resource_limit) %> <% materials_count = @node.materials.count %> diff --git a/app/views/search/common/_search_panel.html.erb b/app/views/search/common/_search_panel.html.erb index 0a2049e68..b36b3ca3a 100644 --- a/app/views/search/common/_search_panel.html.erb +++ b/app/views/search/common/_search_panel.html.erb @@ -1,6 +1,6 @@ <% show_subscription_button ||= false %> -
+
<% if TeSS::Config.solr_enabled %> diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb index dad8ec72d..87305dd61 100644 --- a/app/views/search/index.html.erb +++ b/app/views/search/index.html.erb @@ -1,51 +1,43 @@ <% page_size = SearchController::PAGE_SIZE %> -
-
- <%= page_title 'Search results' %> +<%= page_title 'Search results' %> - <%# SEARCH BAR %> -
- <%= render partial: 'search/common/search_box', locals: { resource_path: search_path } %> -
+<%# SEARCH BAR %> +
+ <%= render partial: 'search/common/search_box', locals: { resource_path: search_path } %> +
-
- <% if @results.blank? %> -

No results found

- <% else %> - <% tabs = @results.keys.sort_by { |k| TeSS::Config.site['tab_order'].index(k.to_s) || 99 } %> - +
+ <% if @results.blank? %> +

No results found

+ <% else %> + <% tabs = @results.keys.sort_by { |k| TeSS::Config.site['tab_order'].index(k.to_s) || 99 } %> + -
- <% @results.each do |model, results_for_model| %> -
-
-
-
- Showing <%= pluralize(results_for_model.results.count, model.to_s.humanize.downcase.singularize) %> - <% if results_for_model.total > page_size %> - out of <%= results_for_model.total -%> - <% end %> -
+
+ <% @results.each do |model, results_for_model| %> +
+
+ Showing <%= pluralize(results_for_model.results.count, model.to_s.humanize.downcase.singularize) %> + <% if results_for_model.total > page_size %> + out of <%= results_for_model.total -%> + <% end %> +
- <%= link_to "View all results & filter", polymorphic_path(model, q: params[:q]), class: 'btn btn-xs btn-default' %> -
-
+ <%= link_to "View all results & filter", polymorphic_path(model, q: params[:q]), class: 'btn btn-xs btn-default' %> - <% if results_for_model.results.count > 0 %> - <%= render partial: 'common/masonry_grid', locals: { objects: results_for_model.results } %> - <% end %> -
+ <% if results_for_model.results.count > 0 %> + <%= render partial: 'common/masonry_grid', locals: { objects: results_for_model.results } %> <% end %>
<% end %>
-
+ <% end %>
diff --git a/app/views/sources/edit.html.erb b/app/views/sources/edit.html.erb index 38157a2ef..c5cd8fd42 100644 --- a/app/views/sources/edit.html.erb +++ b/app/views/sources/edit.html.erb @@ -1,18 +1,16 @@ <%- model_class = Source -%> -
-
-
- <%= page_title(t('.title', default: [:'helpers.titles.edit', 'Edit %{model}'], model: model_class.model_name.human.titleize.downcase)) %> -
-
- <%= render partial: 'sources/partials/general_source_info' %> -
-
- <% if @source.approved? && !policy(@source).approve? %> -
<%= t('sources.info.reapproval_notice') %>

- <% end %> +
+ <%= page_title(t('.title', default: [:'helpers.titles.edit', 'Edit %{model}'], model: model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render partial: 'sources/partials/general_source_info' %> +
+
+ <% if @source.approved? && !policy(@source).approve? %> +
<%= t('sources.info.reapproval_notice') %>

+ <% end %> - <%= render partial: 'form' %> -
+ <%= render partial: 'form' %>
diff --git a/app/views/sources/new.html.erb b/app/views/sources/new.html.erb index 3b8496339..84bcf953a 100644 --- a/app/views/sources/new.html.erb +++ b/app/views/sources/new.html.erb @@ -1,21 +1,16 @@ <%- model_class = Source -%> +
+ <%= page_title(t('.title', default: [:'helpers.titles.new', 'New %{model}'], model: model_class.model_name.human.titleize.downcase)) %> +
+
+
+ <%= render partial: 'sources/partials/general_source_info' %> +
+
+ <% unless policy(@source).approve? %> +
<%= t('sources.info.approval_notice') %>

+ <% end %> -
-
-
- <%= page_title(t('.title', default: [:'helpers.titles.new', 'New %{model}'], model: model_class.model_name.human.titleize.downcase)) %> -
-
-
- <%= render partial: 'sources/partials/general_source_info' %> -
-
- <% unless policy(@source).approve? %> -
<%= t('sources.info.approval_notice') %>

- <% end %> - - <%= render partial: 'form' %> -
-
+ <%= render partial: 'form' %>
diff --git a/app/views/sources/show.html.erb b/app/views/sources/show.html.erb index bd40a7abb..7b5c75469 100644 --- a/app/views/sources/show.html.erb +++ b/app/views/sources/show.html.erb @@ -17,7 +17,7 @@
-
+