Merge branch '4515-search-empty-project' closes #4515

diff --git a/apps/workbench/app/assets/stylesheets/application.css.scss b/apps/workbench/app/assets/stylesheets/application.css.scss
index 51d4702485e04e583d59aac3f2fc78b38d0c343f..9bc93e32bd49574ff998e60980c6417cb98d4770 100644 (file)
--- a/apps/workbench/app/assets/stylesheets/application.css.scss
+++ b/apps/workbench/app/assets/stylesheets/application.css.scss
@@ -204,6 +204,11 @@ table.table-fixed-header-row tbody {
     top:1.5em;
 }
 
+.dropdown-menu {
+    max-height: 30em;
+    overflow-y: auto;
+}
+
 .row-fill-height, .row-fill-height>div[class*='col-'] {
     display: flex;
 }

diff --git a/apps/workbench/app/views/application/_projects_tree_menu.html.erb b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
index 4a49184aaf409805dcd3df2dd41e3ab632fefb33..4de3c2330ed55407c6a01053906a3ddc37dc91b6 100644 (file)
--- a/apps/workbench/app/views/application/_projects_tree_menu.html.erb
+++ b/apps/workbench/app/views/application/_projects_tree_menu.html.erb
@@ -1,30 +1,25 @@
-              <li>
-                <%= link_to projects_path(options: {ensure_unique_name: true}), method: :post, class: 'btn btn-xs btn-default pull-right' do %>
-                  <i class="fa fa-plus"></i> Add a new project
-                <% end %>
-              </li>
-              <li>
-                <%= project_link_to.call({object: current_user, depth: 0}) do %>
-                  <span style="padding-left: 0"></span>Home
-                <% end %>
-              </li>
-              <% my_project_tree.each do |pnode| %>
-                <% next if pnode[:object].class != Group %>
-                <li>
-                  <%= project_link_to.call pnode do %>
-                    <span style="padding-left: <%= pnode[:depth] %>em"></span><%= pnode[:object].name %>
-                  <% end %>
-                </li>
-              <% end %>
-              <li class="divider" />
-              <li role="presentation" class="dropdown-header">
-                Projects shared with me
-              </li>
-              <% shared_project_tree.each do |pnode| %>
-                <% next if pnode[:object].class != Group %>
-                <li>
-                  <%= project_link_to.call pnode do %>
-                    <span style="padding-left: <%= pnode[:depth]-1 %>em"></span><i class="fa fa-fw fa-share-alt" style="color:#aaa"></i> <%= pnode[:object].name %>
-                  <% end %>
-                </li>
-              <% end %>
+<li>
+  <%= project_link_to.call({object: current_user, depth: 0}) do %>
+    <span style="padding-left: 0">Home</span>
+  <% end %>
+</li>
+<% my_project_tree.each do |pnode| %>
+  <% next if pnode[:object].class != Group %>
+  <li>
+    <%= project_link_to.call pnode do %>
+      <span style="padding-left: <%= pnode[:depth] %>em"></span><%= pnode[:object].name %>
+    <% end %>
+  </li>
+<% end %>
+<li class="divider" />
+<li role="presentation" class="dropdown-header">
+  Projects shared with me
+</li>
+<% shared_project_tree.each do |pnode| %>
+  <% next if pnode[:object].class != Group %>
+  <li>
+    <%= project_link_to.call pnode do %>
+      <span style="padding-left: <%= pnode[:depth]-1 %>em"></span><i class="fa fa-fw fa-share-alt" style="color:#aaa"></i> <%= pnode[:object].name %>
+    <% end %>
+  </li>
+<% end %>

diff --git a/apps/workbench/app/views/layouts/body.html.erb b/apps/workbench/app/views/layouts/body.html.erb
index 07b536b8e366fcef537ad7f3f869c90462787566..824e370c582d6ad2ea80f12ac8b342bb099a2464 100644 (file)
--- a/apps/workbench/app/views/layouts/body.html.erb
+++ b/apps/workbench/app/views/layouts/body.html.erb
@@ -45,15 +45,11 @@
                 <%= current_user.email %> <span class="caret"></span>
               </a>
               <ul class="dropdown-menu" role="menu">
-                <li role="presentation" class="dropdown-header">
-                  My account
-                </li>
                 <% if current_user.is_active %>
                 <li role="menuitem"><a href="/manage_account" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage account</a></li>
                 <% if Rails.configuration.user_profile_form_fields %>
                   <li role="menuitem"><a href="/users/<%=current_user.uuid%>/profile" role="menuitem"><i class="fa fa-key fa-fw"></i> Manage profile</a></li>
                 <% end %>
-                <li role="presentation" class="divider"></li>
                 <% end %>
                 <li role="menuitem"><a href="<%= logout_path %>" role="menuitem"><i class="fa fa-sign-out fa-fw"></i> Log out</a></li>
                 <% if current_user.is_active and
@@ -152,7 +148,12 @@
               Projects
               <span class="caret"></span>
             </a>
-            <ul class="dropdown-menu" role="menu">
+            <ul class="dropdown-menu" style="min-width: 20em" role="menu">
+              <li>
+                <%= link_to projects_path(options: {ensure_unique_name: true}), method: :post, class: 'btn btn-xs btn-default pull-right' do %>
+                  <i class="fa fa-plus"></i> Add a new project
+                <% end %>
+              </li>
               <%= render partial: "projects_tree_menu", locals: {
                   :project_link_to => Proc.new do |pnode, &block|
                     link_to(project_path(pnode[:object].uuid),

diff --git a/sdk/python/.gitignore b/sdk/python/.gitignore
index 105d068d4b60377ef81bcd0f4af620da766bdb68..ab21552d2e16fec0c536ed9de107a630bbab0956 100644 (file)
--- a/sdk/python/.gitignore
+++ b/sdk/python/.gitignore
@@ -1,5 +1,7 @@
+*.pyc
 /build/
 /dist/
-/*.egg
-/*.egg-info
+*.egg
+*.egg-info
 /tests/tmp
+.eggs

diff --git a/services/nodemanager/.gitignore b/services/nodemanager/.gitignore
deleted file mode 100644 (file)
index d6bc7fefd17b560b91e44b1fb806838ecd913cb0..0000000000000000000000000000000000000000
--- a/services/nodemanager/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.pyc
-*.egg
-*.egg-info
-build/
-dist/

diff --git a/services/nodemanager/.gitignore b/services/nodemanager/.gitignore
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ed3b3622f2486f6bd6ff8c3f486ef80fbb045db0
--- /dev/null
+++ b/services/nodemanager/.gitignore
@@ -0,0 +1 @@
+../../sdk/python/.gitignore
\ No newline at end of file