Merge pull request #44 from floriank/fix/ci-failing-cukes

Fix locking of used blocks in select menu

app/assets/javascripts/my_project_page/my_project_page.js

@@ -79,7 +79,12 @@
       return;
     }
     for (var i = 0; i < s.options.length; i++) {
-      if ($('block_' + s.options[i].value)) {
+      var name = s.options[i].value || '';
+      // this becomes necessary as the block names are saved with dashes in the db,
+      // but their ids use underscores in the frontend - this changes the name to find 
+      // the block in the DOM
+      name = name.replace(/\-/g, '_');
+      if ($('block_' + name)) {
         s.options[i].disabled = true;
       } else {
         s.options[i].disabled = false;

app/views/my_projects_overviews/index.html.erb

@@ -30,7 +30,7 @@ See doc/COPYRIGHT.md for more details.
 <%= toolbar title: l(:label_overview) do %>
   <% if User.current.allowed_to?(:add_subprojects, project) %>
     <li class="toolbar-item">
-      <%= link_to new_project_path(parent_id: project), class: 'button -highlight' do %>
+      <%= link_to new_project_path(parent_id: project), class: 'button -alt-highlight' do %>
         <i class="icon-add"></i> <%= l(:label_subproject_new) %>
       <% end %>
     </li>