Skip to content

G
gitlab-ce
Commit 1811d32e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files
Options

Squash project settings navs

parent 8e737ed5
Hide whitespace changes
Inline Side-by-side
Showing with 190 additions and 201 deletions
app/assets/stylesheets/gitlab_bootstrap/nav.scss
View file @ 1811d32e
...@@ -22,6 +22,13 @@ ...@@ -22,6 +22,13 @@
color: $style_color; color: $style_color;
font-weight: bold; font-weight: bold;
} }
&.nav-stacked-menu {
background: #FAFAFA;
li > a {
padding: 20px;
}
}
} }
} }
......
app/controllers/deploy_keys_controller.rb
View file @ 1811d32e
...@@ -4,6 +4,8 @@ class DeployKeysController < ProjectResourceController ...@@ -4,6 +4,8 @@ class DeployKeysController < ProjectResourceController
# Authorize # Authorize
before_filter :authorize_admin_project! before_filter :authorize_admin_project!
layout "project_settings"
def index def index
@enabled_keys = @project.deploy_keys.all @enabled_keys = @project.deploy_keys.all
@available_keys = available_keys - @enabled_keys @available_keys = available_keys - @enabled_keys
......
app/controllers/hooks_controller.rb
View file @ 1811d32e
...@@ -5,6 +5,8 @@ class HooksController < ProjectResourceController ...@@ -5,6 +5,8 @@ class HooksController < ProjectResourceController
respond_to :html respond_to :html
layout "project_settings"
def index def index
@hooks = @project.hooks.all @hooks = @project.hooks.all
@hook = ProjectHook.new @hook = ProjectHook.new
......
app/controllers/projects_controller.rb
View file @ 1811d32e
...@@ -15,6 +15,7 @@ class ProjectsController < ProjectResourceController ...@@ -15,6 +15,7 @@ class ProjectsController < ProjectResourceController
end end
def edit def edit
render 'edit', layout: "project_settings"
end end
def create def create
...@@ -42,7 +43,7 @@ class ProjectsController < ProjectResourceController ...@@ -42,7 +43,7 @@ class ProjectsController < ProjectResourceController
format.html { redirect_to edit_project_path(@project), notice: 'Project was successfully updated.' } format.html { redirect_to edit_project_path(@project), notice: 'Project was successfully updated.' }
format.js format.js
else else
format.html { render action: "edit" } format.html { render action: "edit", layout: "project_settings" }
format.js format.js
end end
end end
......
app/controllers/services_controller.rb
View file @ 1811d32e
...@@ -5,6 +5,8 @@ class ServicesController < ProjectResourceController ...@@ -5,6 +5,8 @@ class ServicesController < ProjectResourceController
respond_to :html respond_to :html
layout "project_settings"
def index def index
@project.build_missing_services @project.build_missing_services
@services = @project.services.reload @services = @project.services.reload
......
app/controllers/team_members_controller.rb
View file @ 1811d32e
...@@ -3,6 +3,8 @@ class TeamMembersController < ProjectResourceController ...@@ -3,6 +3,8 @@ class TeamMembersController < ProjectResourceController
before_filter :authorize_read_project! before_filter :authorize_read_project!
before_filter :authorize_admin_project!, except: [:index, :show] before_filter :authorize_admin_project!, except: [:index, :show]
layout "project_settings"
def index def index
@group = @project.group @group = @project.group
@users_projects = @project.users_projects.order('project_access DESC') @users_projects = @project.users_projects.order('project_access DESC')
......
app/views/deploy_keys/index.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
%p.slead %p.slead
Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers Deploy keys allow read-only access to repository. They can be used for CI, staging or production servers
...@@ -12,7 +10,7 @@ ...@@ -12,7 +10,7 @@
%hr.clearfix %hr.clearfix
.row .row
.span6.enabled-keys .span5.enabled-keys
%h5.cgreen %h5.cgreen
Enabled deploy keys Enabled deploy keys
%small for this project %small for this project
...@@ -21,7 +19,7 @@ ...@@ -21,7 +19,7 @@
- if @enabled_keys.blank? - if @enabled_keys.blank?
.light-well .light-well
%p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one %p.nothing_here_message Create #{link_to 'new deploy key', new_project_deploy_key_path(@project)} or add existing one
.span6.available-keys .span5.available-keys
%h5 %h5
Available deploy keys Available deploy keys
%small from projects you are able to manage %small from projects you are able to manage
......
app/views/deploy_keys/new.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
%h3.page_title New Deploy key %h3.page_title New Deploy key
%hr %hr
......
app/views/deploy_keys/show.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
%h3.page_title %h3.page_title
Deploy key: Deploy key:
= @key.title = @key.title
......
app/views/hooks/index.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
- if can? current_user, :admin_project, @project - if can? current_user, :admin_project, @project
.alert.alert-info .alert.alert-info
%span %span
......
app/views/layouts/project_settings.html.haml 0 → 100644
View file @ 1811d32e
!!! 5
%html{ lang: "en"}
= render "layouts/head", title: @project.name_with_namespace
%body{class: "#{app_theme} project", :'data-page' => body_data_page, :'data-project-id' => @project.id }
= render "layouts/head_panel", title: project_title(@project)
= render "layouts/init_auto_complete"
= render "layouts/flash"
- if can?(current_user, :download_code, @project)
= render 'shared/no_ssh'
%nav.main-nav
.container= render 'layouts/nav/project'
.container
.content
.row
.span2
= render "projects/settings_nav"
.span10
= yield
app/views/projects/_settings_nav.html.haml
View file @ 1811d32e
%ul.nav.nav-tabs %ul.nav.nav-pills.nav-stacked.nav-stacked-menu
= nav_link(path: 'projects#edit') do = nav_link(path: 'projects#edit') do
= link_to edit_project_path(@project), class: "stat-tab tab " do = link_to edit_project_path(@project), class: "stat-tab tab " do
%i.icon-edit %i.icon-edit
Edit Edit Project
= nav_link(controller: [:team_members, :teams]) do = nav_link(controller: [:team_members, :teams]) do
= link_to project_team_index_path(@project), class: "team-tab tab" do = link_to project_team_index_path(@project), class: "team-tab tab" do
%i.icon-group %i.icon-group
......
app/views/projects/edit.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
.project-edit-container .project-edit-container
%h3.page_title Edit Project
%hr
.project-edit-errors .project-edit-errors
.project-edit-content .project-edit-content
.row .ui-box.white
.span3 %h5.title Settings:
%ul.nav.nav-pills.nav-stacked .form-holder
%li.active = form_for(@project, remote: true) do |f|
= link_to 'Settings', '#tab-settings', 'data-toggle' => 'tab' %fieldset
%li .clearfix.project_name_holder
= link_to 'Rename repo', '#tab-rename', 'data-toggle' => 'tab' = f.label :name do
%li Project name is
= link_to 'Transfer', '#tab-transfer', 'data-toggle' => 'tab' .input
%li = f.text_field :name, placeholder: "Example Project", class: "span5"
= link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab'
.span9 .clearfix
.tab-content = f.label :description do
.tab-pane.active#tab-settings Project description
.ui-box.white %span.light (optional)
%h5.title Settings: .input
.form-holder = f.text_area :description, placeholder: "awesome project", class: "span5", rows: 3, maxlength: 250
= form_for(@project, remote: true) do |f|
%fieldset - unless @project.empty_repo?
.clearfix.project_name_holder .clearfix
= f.label :name do = f.label :default_branch, "Default Branch"
Project name is .input= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen'})
.input
= f.text_field :name, placeholder: "Example Project", class: "span5"
- if can?(current_user, :change_public_mode, @project)
%fieldset.public-mode
.clearfix %legend
= f.label :description do Public mode:
Project description .control-group
%span.light (optional) = f.label :public, class: 'control-label' do
.input %span Public access
= f.text_area :description, placeholder: "awesome project", class: "span5", rows: 3, maxlength: 250 .controls
= f.check_box :public
- unless @project.empty_repo? %span.descr
.clearfix If checked, this project can be cloned
= f.label :default_branch, "Default Branch" %em without any
.input= f.select(:default_branch, @repository.branch_names, {}, {class: 'chosen'}) authentication.
It will also be listed on the #{link_to "public access directory", public_root_path}.
%em Any
- if can?(current_user, :change_public_mode, @project) user will have #{link_to "Guest", help_permissions_path} permissions on the repository.
%fieldset.public-mode
%legend %fieldset.features
Public mode: %legend
.control-group Labels:
= f.label :public, class: 'control-label' do .control-group
%span Public access = f.label :label_list, "Labels", class: 'control-label'
.controls .controls
= f.check_box :public = f.text_field :label_list, maxlength: 2000, class: "span5"
%span.descr %p.hint Separate with comma.
If checked, this project can be cloned
%em without any %fieldset.features
authentication. %legend
It will also be listed on the #{link_to "public access directory", public_root_path}. Features:
%em Any .control-group
user will have #{link_to "Guest", help_permissions_path} permissions on the repository. = f.label :issues_enabled, "Issues", class: 'control-label'
.controls
%fieldset.features = f.check_box :issues_enabled
%legend %span.descr Lightweight issue tracking system for this project
Labels:
.control-group - if Project.issues_tracker.values.count > 1
= f.label :label_list, "Labels", class: 'control-label' .control-group
.controls = f.label :issues_tracker, "Issues tracker", class: 'control-label'
= f.text_field :label_list, maxlength: 2000, class: "span5" .input= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled })
%p.hint Separate with comma.
.clearfix
%fieldset.features = f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label'
%legend .input= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id?
Features:
.control-group .control-group
= f.label :issues_enabled, "Issues", class: 'control-label' = f.label :merge_requests_enabled, "Merge Requests", class: 'control-label'
.controls .controls
= f.check_box :issues_enabled = f.check_box :merge_requests_enabled
%span.descr Lightweight issue tracking system for this project %span.descr Submit changes to be merged upstream.
- if Project.issues_tracker.values.count > 1 .control-group
.control-group = f.label :wiki_enabled, "Wiki", class: 'control-label'
= f.label :issues_tracker, "Issues tracker", class: 'control-label' .controls
.input= f.select(:issues_tracker, Project.issues_tracker.values, {}, { disabled: !@project.issues_enabled }) = f.check_box :wiki_enabled
%span.descr Pages for project documentation
.clearfix
= f.label :issues_tracker_id, "Project name or id in issues tracker", class: 'control-label' .control-group
.input= f.text_field :issues_tracker_id, disabled: !@project.can_have_issues_tracker_id? = f.label :wall_enabled, "Wall", class: 'control-label'
.controls
.control-group = f.check_box :wall_enabled
= f.label :merge_requests_enabled, "Merge Requests", class: 'control-label' %span.descr Simple chat system for broadcasting inside project
.controls
= f.check_box :merge_requests_enabled .control-group
%span.descr Submit changes to be merged upstream. = f.label :snippets_enabled, "Snippets", class: 'control-label'
.controls
.control-group = f.check_box :snippets_enabled
= f.label :wiki_enabled, "Wiki", class: 'control-label' %span.descr Share code pastes with others out of git repository
.controls
= f.check_box :wiki_enabled
%span.descr Pages for project documentation .form-actions
= f.submit 'Save', class: "btn btn-save"
.control-group
= f.label :wall_enabled, "Wall", class: 'control-label' - if can?(current_user, :change_namespace, @project)
.controls .ui-box.ui-box-danger
= f.check_box :wall_enabled %h5.title Transfer project
%span.descr Simple chat system for broadcasting inside project .errors-holder
.form-holder
.control-group = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
= f.label :snippets_enabled, "Snippets", class: 'control-label' .control-group
.controls = f.label :namespace_id do
= f.check_box :snippets_enabled %span Namespace
%span.descr Share code pastes with others out of git repository .controls
.clearfix
= f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}
.form-actions %ul
= f.submit 'Save', class: "btn btn-save" %li Be careful. Changing project namespace can have unintended side effects
%li You can transfer project only to namespaces you can manage
.tab-pane#tab-transfer %li You will need to update your local repositories to point to the new location.
- if can?(current_user, :change_namespace, @project) .form-actions
.ui-box.ui-box-danger = f.submit 'Transfer', class: "btn btn-remove"
%h5.title Transfer project - else
.errors-holder %p.nothing_here_message Only project owner can transfer a project
.form-holder
= form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f| .ui-box.ui-box-danger
.control-group %h5.title Rename repository
= f.label :namespace_id do .errors-holder
%span Namespace .form-holder
.controls = form_for(@project) do |f|
.clearfix .control-group
= f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'} = f.label :path do
%ul %span Path
%li Be careful. Changing project namespace can have unintended side effects .controls
%li You can transfer project only to namespaces you can manage .clearfix
%li You will need to update your local repositories to point to the new location. = f.text_field :path
.form-actions %ul
= f.submit 'Transfer', class: "btn btn-remove" %li Be careful. Rename of project repo can have unintended side effects
- else %li You will need to update your local repositories to point to the new location.
%p.nothing_here_message Only project owner can transfer a project .form-actions
= f.submit 'Rename', class: "btn btn-remove"
.tab-pane#tab-rename
.ui-box.ui-box-danger - if can?(current_user, :remove_project, @project)
%h5.title Rename repository .ui-box.ui-box-danger
.errors-holder %h5.title Remove project
.form-holder .ui-box-body
= form_for(@project) do |f| %p
.control-group Remove of project will cause removing repository and all related resources like issues, merge requests etc.
= f.label :path do %p
%span Path %strong Removed project can not be restored!
.controls
.clearfix = link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove btn-small"
= f.text_field :path - else
%ul %p.nothing_here_message Only project owner can remove a project
%li Be careful. Rename of project repo can have unintended side effects
%li You will need to update your local repositories to point to the new location.
.form-actions
= f.submit 'Rename', class: "btn btn-remove"
.tab-pane#tab-remove
- if can?(current_user, :remove_project, @project)
.ui-box.ui-box-danger
%h5.title Remove project
.ui-box-body
%p
Remove of project will cause removing repository and all related resources like issues, merge requests etc.
%p
%strong Removed project can not be restored!
= link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove btn-small"
- else
%p.nothing_here_message Only project owner can remove a project
.save-project-loader.hide .save-project-loader.hide
%center %center
......
app/views/services/edit.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
= render 'form' = render 'form'
app/views/services/index.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
%h3.page_title Services %h3.page_title Services
%br %br
......
app/views/team_members/import.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
%h3.page_title %h3.page_title
= "Import team from another project" = "Import team from another project"
%hr %hr
......
app/views/team_members/index.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
%h3.page_title %h3.page_title
Users with access to this project Users with access to this project
...@@ -12,15 +11,6 @@ ...@@ -12,15 +11,6 @@
%p.light %p.light
Read more about project permissions Read more about project permissions
%strong= link_to "here", help_permissions_path, class: "vlink" %strong= link_to "here", help_permissions_path, class: "vlink"
.clearfix
- if @group - if @group
.row = render "team_members/group_members"
.span6 = render "team_members/team", members: @users_projects
= render "team_members/group_members"
.span6
= render "team_members/team", members: @users_projects
- else
= render "team_members/team", members: @users_projects
app/views/team_members/new.html.haml
View file @ 1811d32e
= render "projects/settings_nav"
= render "team_members/form" = render "team_members/form"
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7