X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0c888bcc93b559339c8abbce784bdcc44746bca2..85c625c40ad873d0efac33f8a63c1ee256185e36:/apps/workbench/app/views/layouts/body.html.erb diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb index c1399f2602..ed19d51d25 100644 --- a/apps/workbench/app/views/layouts/body.html.erb +++ b/apps/workbench/app/views/layouts/body.html.erb @@ -11,7 +11,7 @@ SPDX-License-Identifier: AGPL-3.0 %> - <% site_name = Rails.configuration.site_name.downcase rescue Rails.application.class.parent_name %> + <% site_name = Rails.configuration.Workbench.SiteName.downcase rescue Rails.application.class.parent_name %> <% if current_user %> <%= site_name %> <% else %> @@ -28,12 +28,12 @@ SPDX-License-Identifier: AGPL-3.0 %> <% if current_user %> <% if current_user.is_active %> - <% if Rails.configuration.multi_site_search %> + <% if !Rails.configuration.Workbench.MultiSiteSearch.empty? %>
  • <%= - target = Rails.configuration.multi_site_search - if target == true + target = Rails.configuration.Workbench.MultiSiteSearch + if target == "true" target = {controller: 'search', action: 'index'} end link_to("Multi-site search", target, {class: 'btn btn-default'}) %> @@ -72,21 +72,47 @@ SPDX-License-Identifier: AGPL-3.0 %>
    • <% if current_user.is_active %>
  • Home project
    • - + <% if Rails.configuration.Services.Composer.ExternalURL != URI("") %> +
  • + + + + +
    • + <% end %> + <% if Rails.configuration.Services.Workbench2.ExternalURL != URI("") %> +
  • + <% + wb2_url = Rails.configuration.Services.Workbench2.ExternalURL.to_s + wb2_url += '/' if wb2_url[-1] != '/' + wb2_url += 'token' + %> +
    + + +
    +
    • + <% end %>
  • <%= link_to virtual_machines_user_path(current_user), role: 'menu-item' do %> Virtual machines <% end %>
    • + <% if Rails.configuration.Workbench.Repositories %>
  • Repositories
    • + <% end -%>
  • Current token
  • <%= link_to ssh_keys_user_path(current_user), role: 'menu-item' do %> SSH keys <% end %> -
    • - - <% if Rails.configuration.user_profile_form_fields %> + +
  • Link account
    • + <% if !Rails.configuration.Workbench.UserProfileFormFields.empty? %>
  • Manage profile
    • <% end %> <% end %> @@ -112,9 +138,11 @@ SPDX-License-Identifier: AGPL-3.0 %> + <% if Rails.configuration.Workbench.Repositories %>
  • Repositories
    • + <% end -%>
  • Virtual machines
    • @@ -133,20 +161,14 @@ SPDX-License-Identifier: AGPL-3.0 %>
  • Groups
    • -
  • - Compute nodes -
  • Keep services
    • -
  • - Keep disks -
    • <% end %> <% else %> - <% if Rails.configuration.anonymous_user_token and Rails.configuration.enable_public_projects_page %> + <% if !Rails.configuration.Users.AnonymousUserToken.empty? and Rails.configuration.Workbench.EnablePublicProjectsPage %>
  • <%= link_to 'Browse public projects', "/projects/public" %>
    • <% end %>
  • @@ -171,18 +193,18 @@ SPDX-License-Identifier: AGPL-3.0 %>
    • - <% if Rails.configuration.enable_getting_started_popup %> + <% if Rails.configuration.Workbench.EnableGettingStartedPopup %>
  • <%= link_to raw(' Getting Started ...'), "#", {'data-toggle' => "modal", 'data-target' => '#getting-started-modal-window'} %>
    • <% end %> - <% if Rails.configuration.arvados_public_data_doc_url %> -
  • <%= link_to raw(' Public Pipelines and Data sets'), "#{Rails.configuration.arvados_public_data_doc_url}", target: "_blank" %>
    • + <% if !Rails.configuration.Workbench.ArvadosPublicDataDocURL.empty? %> +
  • <%= link_to raw(' Public Pipelines and Data sets'), "#{Rails.configuration.Workbench.ArvadosPublicDataDocURL}", target: "_blank" %>
    • <% end %> -
  • <%= link_to raw(' Tutorials and User guide'), "#{Rails.configuration.arvados_docsite}/user", target: "_blank" %>
    • -
  • <%= link_to raw(' API Reference'), "#{Rails.configuration.arvados_docsite}/api", target: "_blank" %>
    • -
  • <%= link_to raw(' SDK Reference'), "#{Rails.configuration.arvados_docsite}/sdk", target: "_blank" %>
    • +
  • <%= link_to raw(' Tutorials and User guide'), "#{Rails.configuration.Workbench.ArvadosDocsite}/user", target: "_blank" %>
    • +
  • <%= link_to raw(' API Reference'), "#{Rails.configuration.Workbench.ArvadosDocsite}/api", target: "_blank" %>
    • +
  • <%= link_to raw(' SDK Reference'), "#{Rails.configuration.Workbench.ArvadosDocsite}/sdk", target: "_blank" %>
  • <%= link_to report_issue_popup_path(popup_type: 'version', current_location: request.url, current_path: request.fullpath, action_method: 'post'), {class: 'report-issue-modal-window', remote: true, return_to: request.url} do %> @@ -236,7 +258,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
    -<% if Rails.configuration.enable_getting_started_popup and current_user and !current_user.prefs[:getting_started_shown] and +<% if Rails.configuration.Workbench.EnableGettingStartedPopup and current_user and !current_user.prefs[:getting_started_shown] and !request.url.include?("/profile") and !request.url.include?("/user_agreements") and !request.url.include?("/inactive")%>