diff --git a/app/assets/stylesheets/ugent/_override.scss b/app/assets/stylesheets/ugent/_override.scss index 4dd9b16bd..a12dcdc8e 100644 --- a/app/assets/stylesheets/ugent/_override.scss +++ b/app/assets/stylesheets/ugent/_override.scss @@ -1,95 +1,14 @@ -.navbar-inverse, .nav-branding { - background-color: #444; - color: white; -} - -.navbar-inverse .navbar-nav > .active > a, .navbar-branding .navbar-nav > .active > a, .navbar-inverse .navbar-nav > .active > a:hover, .navbar-inverse .navbar-nav > .active > a:focus { - color: #444; - background-color: white; -} - -.navbar-inverse .navbar-nav>li>a, .navbar-branding .navbar-nav>li>a { - color: white; -} - -.inverse-dropdown { - background-color: white !important; - border-color: #444 !important; -} - -.inverse-dropdown > li > a { - color: #444 !important; -} - -.inverse-dropdown > li > a:hover { - background-color: #f5f5f5; - color: #444; -} - -#org-navbar { - .navbar-nav li a { - color: #1a1a1a; - } - .inverse-dropdown .active a { - color: #FFF !important; - background-color: #444 !important; - } - .dropdown-menu > .active > a { - color: #262626; - text-decoration: none; - background-color: #f5f5f5; - outline-width: 2px !important; - outline-style: solid !important; - outline-color: #107896 !important; - } -} - -#app-navbar { - .dropdown-menu.inverse-dropdown > .active > a, .dropdown-menu.inverse-dropdown > li > a:hover { - color: #262626 !important; - text-decoration: none; - background-color: #f5f5f5 !important; - outline-width: 2px !important; - outline-style: solid !important; - outline-color: #107896 !important; - } -} - .sign-in { margin-top: 30px; } #sign-in-form { - display: flex; gap: 30px; - flex-wrap: wrap; } -#sign-in-form > .panel { + +#sign-in-form > .card { flex: 1; text-align: center; min-width: 350px; -} - -/* - fix button hover effect that enlarges button -*/ - -.btn-primary, -.btn-primary:hover, -.btn-primary:focus, -.btn-primary:active, -.btn-primary:visited, -.btn-primary:active:hover, -.btn-primary.active:hover { - margin: 5px 0px 0px 0px; -} - -.btn-default, -.btn-default:hover, -.btn-default:focus, -.btn-default:active, -.btn-default:visited, -.btn-default:active:hover, -.btn-default.active:hover { - margin: 5px 0px 0px 0px; + border: 1px solid black; } diff --git a/app/views/branded/devise/registrations/_personal_details.html.erb b/app/views/branded/devise/registrations/_personal_details.html.erb index 1269d06e6..d01b7220a 100644 --- a/app/views/branded/devise/registrations/_personal_details.html.erb +++ b/app/views/branded/devise/registrations/_personal_details.html.erb @@ -4,23 +4,23 @@ <%= hidden_field_tag :unlink_flag, "false", id: 'unlink_flag' %>
- <%= f.label(:email, _('Email'), class: 'control-label') %> + <%= f.label(:email, _('Email'), class: 'form-label') %>

<%= @user.email %>

- <%= f.label(:firstname, _('First name'), class: 'control-label') %> + <%= f.label(:firstname, _('First name'), class: 'form-label') %> <%= f.text_field(:firstname, class: "form-control", "aria-required": true, value: @user.firstname) %>
- <%= f.label(:surname, _('Last name'), class: 'control-label') %> + <%= f.label(:surname, _('Last name'), class: 'form-label') %> <%= f.text_field(:surname, class: "form-control", "aria-required": true, value: @user.surname) %>
- <%= f.label(:org_name, _('Organisation'), class: 'control-label') %> + <%= f.label(:org_name, _('Organisation'), class: 'form-label') %>

<%= @user.org.name %>

@@ -37,7 +37,7 @@ <% @identifier_schemes.each do |scheme| %> <% next unless scheme.name.downcase == 'orcid' %>
- <%= label_tag(:scheme_name, 'ORCID', class: 'control-label') %> + <%= label_tag(:scheme_name, 'ORCID', class: 'form-label') %>
<%= render partial: "external_identifier", @@ -49,11 +49,11 @@ <% unless @user.api_token.blank? %>
- <%= f.label(:api_token, _('API token'), class: 'control-label') %> + <%= f.label(:api_token, _('API token'), class: 'form-label') %> <%= @user.api_token %>
- <%= label_tag(:api_information, _('API Information'), class: 'control-label') %> + <%= label_tag(:api_information, _('API Information'), class: 'form-label') %> <%= _('How to use the API') %>
<% end %> diff --git a/app/views/branded/devise/registrations/edit.html.erb b/app/views/branded/devise/registrations/edit.html.erb index cbdbbb84d..6eddf8bfa 100644 --- a/app/views/branded/devise/registrations/edit.html.erb +++ b/app/views/branded/devise/registrations/edit.html.erb @@ -8,19 +8,19 @@
diff --git a/app/views/branded/home/index.html.erb b/app/views/branded/home/index.html.erb index b8cda2297..08de600ba 100644 --- a/app/views/branded/home/index.html.erb +++ b/app/views/branded/home/index.html.erb @@ -1,9 +1,9 @@
-
+
<%= render partial: 'home/welcome' %>
-
+
<%= render partial: 'shared/access_controls' %>
diff --git a/app/views/branded/layouts/_signin_signout.html.erb b/app/views/branded/layouts/_signin_signout.html.erb index d94ba74b9..c5366da28 100644 --- a/app/views/branded/layouts/_signin_signout.html.erb +++ b/app/views/branded/layouts/_signin_signout.html.erb @@ -1,33 +1,34 @@ <% if user_signed_in? %> -
- <% style = guidance_comments_opened_by_default ? '' : 'display: none' %> - <% style = Rails.configuration.x.application.guidance_comments_toggleable ? style : style + ';border-left:none' %> + <% style = guidance_comments_opened_by_default ? 'border-left:none' : 'display: none' %>
<%= render partial: '/phases/guidances_notes', locals: { diff --git a/app/views/branded/plans/_download_form.html.erb b/app/views/branded/plans/_download_form.html.erb index 003cfec39..b188176eb 100644 --- a/app/views/branded/plans/_download_form.html.erb +++ b/app/views/branded/plans/_download_form.html.erb @@ -16,12 +16,19 @@ <%= hidden_field_tag 'export[form]', true %> <% @phase_options = @plan.phases.all.sort_by(&:number).map {|p| [p.title, p.id] } %> <% if @phase_options.length > 1 %> -
- <%= label_tag(:phase_id, _("Select phase to download"), class: 'form-label') %> - <%= select_tag(:phase_id, options_for_select(@phase_options, @phase_options[0])) %> -
+
+ <%= _("Select phases to download") %> + <% @phase_options.each do |phase_option| %> +
+ +
+ <% end %> +
<% else %> - <%= hidden_field_tag(:phase_id, @phase_options[0][1]) %> + <%= hidden_field_tag("phase_id[]", @phase_options[0][1]) %> <% end %>
<%= _("Optional plan components") %> @@ -136,27 +143,17 @@ diff --git a/app/views/branded/plans/index.html.erb b/app/views/branded/plans/index.html.erb index 3fa00eaf2..f01d80f70 100644 --- a/app/views/branded/plans/index.html.erb +++ b/app/views/branded/plans/index.html.erb @@ -3,10 +3,10 @@

<%= _('My Dashboard') %>

-
+

The table below lists all the plans associated with the current user account. This includes the plans you have created with this account and the plans that have been shared with you for this account.

<% if current_user.alternative_accounts.any? %> - Don't see all your plans? + Don't see all your plans?

If you have multiple user accounts in DMPonline.be, and you want to view the plans associated with another account, switch to your other account. This can be done as follows:

    @@ -37,7 +37,7 @@
<% end %>
-
+
<% if @organisationally_or_publicly_visible.any? && !current_user.org.is_other? %>

<%= _('%{org_title} Plans') % { :org_title => current_user.org.name } %>

<%= _('The table below lists the plans that users at your organisation have created and shared within your organisation. This allows you to download a PDF and view their plans as samples or to discover new research data.') %>

diff --git a/app/views/branded/shared/_access_controls.html.erb b/app/views/branded/shared/_access_controls.html.erb index d80667ae1..1b03a32ba 100644 --- a/app/views/branded/shared/_access_controls.html.erb +++ b/app/views/branded/shared/_access_controls.html.erb @@ -1,6 +1,6 @@