Commit 190c9e9f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'fix-project-edit' into 'master'

Improve project edit form

Properly align checkboxes according to bootstrap

Before:

![Screenshot_2015-06-10_17.01.26](https://gitlab.com/gitlab-org/gitlab-ce/uploads/2e874cc0a6edd52d98a17030f3d16f24/Screenshot_2015-06-10_17.01.26.png)

After:

![Screenshot_2015-06-10_16.59.31](https://gitlab.com/gitlab-org/gitlab-ce/uploads/7d91ffe8e981f9bc57d9a18ce8ac79e2/Screenshot_2015-06-10_16.59.31.png)
Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

See merge request !793
parents e407a481 36208490
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
Project settings Project settings
%hr %hr
.panel-body .panel-body
= form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit_project form-horizontal" }, authenticity_token: true do |f| = form_for [@project.namespace.becomes(Namespace), @project], remote: true, html: { multipart: true, class: "edit_project form-horizontal fieldset-form" }, authenticity_token: true do |f|
%fieldset %fieldset
.form-group.project_name_holder .form-group.project_name_holder
...@@ -41,31 +41,39 @@ ...@@ -41,31 +41,39 @@
%legend %legend
Features: Features:
.form-group .form-group
= f.label :issues_enabled, "Issues", class: 'control-label' .col-sm-offset-2.col-sm-10
.col-sm-10
.checkbox .checkbox
= f.label :issues_enabled do
= f.check_box :issues_enabled = f.check_box :issues_enabled
%strong Issues
%br
%span.descr Lightweight issue tracking system for this project %span.descr Lightweight issue tracking system for this project
.form-group .form-group
= f.label :merge_requests_enabled, "Merge Requests", class: 'control-label' .col-sm-offset-2.col-sm-10
.col-sm-10
.checkbox .checkbox
= f.label :merge_requests_enabled do
= f.check_box :merge_requests_enabled = f.check_box :merge_requests_enabled
%strong Merge Requests
%br
%span.descr Submit changes to be merged upstream. %span.descr Submit changes to be merged upstream.
.form-group .form-group
= f.label :wiki_enabled, "Wiki", class: 'control-label' .col-sm-offset-2.col-sm-10
.col-sm-10
.checkbox .checkbox
= f.label :wiki_enabled do
= f.check_box :wiki_enabled = f.check_box :wiki_enabled
%strong Wiki
%br
%span.descr Pages for project documentation %span.descr Pages for project documentation
.form-group .form-group
= f.label :snippets_enabled, "Snippets", class: 'control-label' .col-sm-offset-2.col-sm-10
.col-sm-10
.checkbox .checkbox
= f.label :snippets_enabled do
= f.check_box :snippets_enabled = f.check_box :snippets_enabled
%strong Snippets
%br
%span.descr Share code pastes with others out of git repository %span.descr Share code pastes with others out of git repository
%fieldset.features %fieldset.features
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment