Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Vladimir Sharshov 2012-05-28 19:12:29 +04:00
parent 2479c1c98b ce762be562
commit 0caf5511be
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/stylesheets/design/custom.scss
View File

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

2
app/helpers/application_helper.rb
View File

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

3
app/views/platforms/base/_sidebar.html.haml
View File

@ -11,7 +11,8 @@
%li{:class => (contr == :repositories) ? 'active' : ''} %li{:class => (contr == :repositories) ? 'active' : ''}
= link_to t("layout.repositories.list_header"), platform_repositories_path(@platform) = link_to t("layout.repositories.list_header"), platform_repositories_path(@platform)
- if can? :mass_builds, @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 - if can? :read, @platform.products.build
%li{:class => (contr == :products) ? 'active' : ''} %li{:class => (contr == :products) ? 'active' : ''}
= link_to t("layout.products.list_header"), platform_products_path(@platform) = link_to t("layout.products.list_header"), platform_products_path(@platform)

3
app/views/platforms/platforms/build_all.html.haml
View File

@ -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| = form_for :build, :url => build_all_platform_path(@platform), :html => { :class => 'form mass_build', :method => :post } do |f|
%section.left %section.left
%h3= t("layout.mass_builds.repositories") %h3= t("layout.mass_builds.repositories")