Merge branch 'master' of github.com:warpc/rosa-build

app/assets/stylesheets/design/custom.scss

@@ -957,3 +957,11 @@ form.mass_build input[type="checkbox"] {
 .bottom_20 {
   margin-bottom: 20px;
 }
+
+form.mass_build section.left {
+  margin-left: 50px;
+}
+
+form.mass_build section.right {
+  margin-right: 50px;
+}

app/helpers/application_helper.rb

@@ -9,7 +9,7 @@ module ApplicationHelper
     when controller_name == 'build_lists' && ['new', 'create'].include?(action_name)
       nil
     when controller_name == 'platforms' && ['build_all', 'mass_builds'].include?(action_name)
-      nil
+      'right slim'
     when controller_name == 'platforms' && action_name == 'show'
       'right bigpadding'
     when controller_name == 'platforms' && action_name == 'clone'

app/views/platforms/base/_sidebar.html.haml

@@ -11,7 +11,8 @@
           %li{:class => (contr == :repositories) ? 'active' : ''}
             = link_to t("layout.repositories.list_header"), platform_repositories_path(@platform)
           - if can? :mass_builds, @platform
-            %li= link_to t("layout.platforms.mass_build"), mass_builds_platform_path(@platform)
+            %li{:class => (contr == :platforms && [:mass_builds, :build_all].include?(act)) ? 'active' : ''}
+              = link_to t("layout.platforms.mass_build"), mass_builds_platform_path(@platform)
           - if can? :read, @platform.products.build
             %li{:class => (contr == :products) ? 'active' : ''}
               = link_to t("layout.products.list_header"), platform_products_path(@platform)

app/views/platforms/platforms/build_all.html.haml

@@ -1,3 +1,6 @@
+= render 'submenu'
+= render 'sidebar'
+
 = form_for :build, :url => build_all_platform_path(@platform), :html => { :class => 'form mass_build', :method => :post } do |f|
   %section.left
     %h3= t("layout.mass_builds.repositories")