7607: added logic to remove getting started dialogue by default. Still needs tests.

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index acb056e9c970635eeef55bee7f1638789ac88fd2..abb79e932790502c007215b857c822ca0908d160 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -159,10 +159,12 @@
               <li role="presentation" class="dropdown-header">
                 Help
               </li>
-              <li>
-              <%= link_to raw('<i class="fa fa-fw fa-info"></i> Getting Started ...'), "#",
-                   {'data-toggle' => "modal", 'data-target' => '#getting-started-modal-window'}  %>
-              </li>
+              <% if Rails.configuration.enable_getting_started_popup %>
+                <li>
+                <%= link_to raw('<i class="fa fa-fw fa-info"></i> Getting Started ...'), "#",
+                     {'data-toggle' => "modal", 'data-target' => '#getting-started-modal-window'}  %>
+                </li>
+              <% end %>
               <% if Rails.configuration.arvados_public_data_doc_url %>
                 <li><%= link_to raw('<i class="fa fa-book fa-fw"></i> Public Pipelines and Data sets'), "#{Rails.configuration.arvados_public_data_doc_url}", target: "_blank" %></li>
               <% end %>
@@ -290,7 +292,7 @@
 <div id="report-issue-modal-window"></div>
 <script src="/browser_unsupported.js"></script>
 
-<%  if current_user and !current_user.prefs[:getting_started_shown] and
+<%  if Rails.configuration.enable_getting_started_popup 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")%>

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index c4a92d273950bbebe15b0faf29ccbe58b3cde3b4..e7b736618e4b3423219121b6352c58b7f0560196 100644 (file)
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -213,6 +213,9 @@ common:
   # when anonymous_user_token is configured, show public projects page
   enable_public_projects_page: true
 
+  # by default, disable the "Getting Started" popup which is specific to the public beta install
+  enable_getting_started_popup: true 
+
   # Ask Arvados API server to compress its response payloads.
   api_response_compression: true