Commit 1b5510a8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

New project page with bootstrap3

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent a11d25b1
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
All projects you have access to are listed here. Public projects are not included here unless you are a member All projects you have access to are listed here. Public projects are not included here unless you are a member
%hr %hr
.row .row
.col-md-3.hidden-sm.hidden-xs .col-md-3.hidden-sm.hidden-xs.side-filters
%fieldset
%ul.nav.nav-pills.nav-stacked %ul.nav.nav-pills.nav-stacked
= nav_tab :scope, nil do = nav_tab :scope, nil do
= link_to projects_dashboard_filter_path(scope: nil) do = link_to projects_dashboard_filter_path(scope: nil) do
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
%span.separator %span.separator
%h1.project_name= title %h1.project_name= title
.navbar-collapse.collapse
%ul.nav.navbar-nav %ul.nav.navbar-nav
%li %li
%a %a
......
.form-group.project-visibility-level-holder .form-group.project-visibility-level-holder
= f.label :visibility_level do = f.label :visibility_level, class: 'control-label' do
Visibility Level Visibility Level
= link_to "(?)", help_public_access_path = link_to "(?)", help_public_access_path
.col-sm-10
- if can_change_visibility_level - if can_change_visibility_level
- Gitlab::VisibilityLevel.values.each do |level| - Gitlab::VisibilityLevel.values.each do |level|
.append-bottom-10
- restricted = restricted_visibility_levels.include?(level) - restricted = restricted_visibility_levels.include?(level)
.col-sm-10
= f.radio_button :visibility_level, level, checked: (visibility_level == level), disabled: restricted = f.radio_button :visibility_level, level, checked: (visibility_level == level), disabled: restricted
%span.descr{:class => ("restricted" if restricted)} %span.descr{:class => ("restricted" if restricted)}
= label :project_visibility_level, level do = label :project_visibility_level, level do
= visibility_level_icon(level) = visibility_level_icon(level)
%strong %strong
= visibility_level_label(level) = visibility_level_label(level)
.light= visibility_level_description(level) .light.prepend-left-20= visibility_level_description(level)
- unless restricted_visibility_levels.empty? - unless restricted_visibility_levels.empty?
.col-sm-10 .col-sm-10
%span.info %span.info
......
...@@ -3,50 +3,51 @@ ...@@ -3,50 +3,51 @@
= render 'projects/errors' = render 'projects/errors'
.project-edit-content .project-edit-content
= form_for @project, remote: true do |f| = form_for @project, remote: true, html: { class: 'new_project form-horizontal' } do |f|
.form-group.project-name-holder .form-group.project-name-holder
= f.label :name do = f.label :name, class: 'control-label' do
%strong Project name %strong Project name
.col-sm-10 .col-sm-10
= f.text_field :name, placeholder: "Example Project", class: "input-lg", tabindex: 1, autofocus: true = f.text_field :name, placeholder: "Example Project", class: "form-control", tabindex: 1, autofocus: true
%span.help-inline %span.help-inline
= link_to "#", class: 'js-toggle-visibility-link' do = link_to "#", class: 'js-toggle-visibility-link' do
%span Customize repository name? %span Customize repository name?
.form-group.js-toggle-visibility-container.gl-hide .form-group.js-toggle-visibility-container.gl-hide
= f.label :path do = f.label :path, class: 'control-label' do
%span Repository name %span Repository name
.col-sm-10 .col-sm-10
.input-append .input-group
= f.text_field :path = f.text_field :path, class: 'form-control'
%span.add-on .git %span.input-group-addon .git
- if current_user.can_select_namespace? - if current_user.can_select_namespace?
.form-group .form-group
= f.label :namespace_id do = f.label :namespace_id, class: 'control-label' do
%span Namespace %span Namespace
.col-sm-10 .col-sm-10
= f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen', tabindex: 2} = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'chosen', tabindex: 2}
.form-group .form-group
.col-sm-2
.col-sm-10 .col-sm-10
= link_to "#", class: 'appear-link' do = link_to "#", class: 'appear-link' do
%i.icon-upload-alt %i.icon-upload-alt
%span Import existing repository? %span Import existing repository?
.form-group.appear-data.import-url-data .form-group.appear-data.import-url-data
= f.label :import_url do = f.label :import_url, class: 'control-label' do
%span Import existing repo %span Import existing repo
.col-sm-10 .col-sm-10
= f.text_field :import_url, class: 'input-lg', placeholder: 'https://github.com/randx/six.git' = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
.light .light
URL must be cloneable URL must be cloneable
.form-group .form-group
= f.label :description do = f.label :description, class: 'control-label' do
Description Description
%span.light (optional) %span.light (optional)
.col-sm-10 .col-sm-10
= f.text_area :description, placeholder: "Awesome project", class: "input-lg", rows: 3, maxlength: 250, tabindex: 3 = f.text_area :description, placeholder: "Awesome project", class: "form-control", rows: 3, maxlength: 250, tabindex: 3
= render "visibility_level", f: f, visibility_level: gitlab_config.default_projects_features.visibility_level, can_change_visibility_level: true = render "visibility_level", f: f, visibility_level: gitlab_config.default_projects_features.visibility_level, can_change_visibility_level: true
.form-actions .form-actions
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
- if current_user.can_create_group? - if current_user.can_create_group?
.pull-right .pull-right
.col-sm-10.light .light
Need a group for several dependent projects? Need a group for several dependent projects?
= link_to new_group_path, class: "btn btn-tiny" do = link_to new_group_path, class: "btn btn-tiny" do
Create a group Create a group
......
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