deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Admin area improved

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-02-11 19:56:18 +02:00
parent a769204ff4
commit cc043f32d8
39 changed files with 434 additions and 334 deletions
Download patch file Download diff file Expand all files Collapse all files

46
app/views/admin/projects/_form.html.haml
View file

@ -1,7 +1,6 @@
= form_for [:admin, @admin_project] do |f|
-if @admin_project.errors.any?
#error_explanation
%h2= "#{pluralize(@admin_project.errors.count, "error")} prohibited this admin_project from being saved:"
.alert-message.block-message.error
%ul
- @admin_project.errors.full_messages.each do |msg|
%li= msg
@ -10,27 +9,58 @@
= f.label :name
.input= f.text_field :name
.clearfix
= f.label :code
.input= f.text_field :code
= f.label :path do
Path
.input
.input-prepend
%span.add-on= "git@#{GIT_HOST["host"]}:"
= f.text_field :path, :placeholder => "example_project", :disabled => !@admin_project.new_record?
.clearfix
= f.label :path
.input= f.text_field :path
= f.label :code do
Code
.input
.input-prepend
%span.add-on= "http://#{GIT_HOST["host"]}/"
= f.text_field :code, :placeholder => "example"
- unless @admin_project.new_record?
.clearfix
= f.label :owner_id
.input= f.select :owner_id, User.all.map { |user| [user.name, user.id] }
- unless @admin_project.heads.empty?
.clearfix
= f.label :default_branch, "Default Branch"
.input= f.select(:default_branch, @admin_project.heads.map(&:name), {}, :style => "width:210px;")
.well
%h5 Features
.clearfix
= f.label :issues_enabled, "Issues"
.input= f.check_box :issues_enabled
.clearfix
= f.label :merge_requests_enabled, "Merge Requests"
.input= f.check_box :merge_requests_enabled
.clearfix
= f.label :wall_enabled, "Wall"
.input= f.check_box :wall_enabled
.clearfix
= f.label :description
.input= f.text_area :description
.input= f.text_area :description, :class => "xxlarge"
.clear
%br
.actions
= f.submit 'Save', :class => "btn"
= f.submit 'Save', :class => "btn primary"
= link_to 'Cancel', [:admin, @admin_project], :class => "btn"
= link_to 'Destroy', [:admin, @admin_project], :confirm => 'Are you sure?', :method => :delete, :class => "btn danger right"
:javascript
$(function(){
taggifyForm();
$('#project_owner_id').chosen();
$('#project_default_branch').chosen();
})

8
app/views/admin/projects/edit.html.haml
View file

@ -1,7 +1,3 @@
%h2= @admin_project.name
%h3= @admin_project.name
%hr
= render 'form'
%br
= link_to 'Back', admin_projects_path, :class => ""
|
= link_to 'Show', [:admin, @admin_project], :class => ""

14
app/views/admin/projects/index.html.haml
View file

@ -1,7 +1,10 @@
%table
%h3
Projects
= link_to 'New Project', new_admin_project_path, :class => "btn small right"
%hr
%table.zebra-striped
%thead
%th Name
%th Code
%th Path
%th Team Members
%th Last Commit
@ -11,12 +14,9 @@
- @admin_projects.each do |project|
%tr
%td= link_to project.name, [:admin, project]
%td= project.code
%td= project.path
%td= project.users_projects.count
%td= last_commit(project)
%td= link_to 'Edit', edit_admin_project_path(project), :id => "edit_#{dom_id(project)}"
%td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete
%td= link_to 'Edit', edit_admin_project_path(project), :id => "edit_#{dom_id(project)}", :class => "btn small"
%td= link_to 'Destroy', [:admin, project], :confirm => 'Are you sure?', :method => :delete, :class => "btn small danger"
= paginate @admin_projects
= link_to 'New Project', new_admin_project_path, :class => "btn"

60
app/views/admin/projects/show.html.haml
View file

@ -1,10 +1,10 @@
- unless notice.nil?
%p#notice= notice
%h3
= @admin_project.name
= link_to 'Edit', edit_admin_project_path(@admin_project), :class => "btn right small"
%hr
%h2= @admin_project.name
%table.round-borders
%table.zebra-striped
%tr
%td
%b
@ -29,14 +29,33 @@
Description:
%td
= @admin_project.description
%tr
%td{:colspan => 2}
= link_to 'Edit', edit_admin_project_path(@admin_project), :class => "btn"
.span-14
%h2 Team
%h3
Team
%small
( #{@admin_project.users_projects.count} )
%hr
%table.zebra-striped
%thead
%tr
%th Name
%th Project Access
%th Repository Access
%th
- @admin_project.users_projects.each do |tm|
%tr
%td
= link_to tm.user_name, admin_users_path(tm.user)
%td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), :class => "medium project-access-select", :disabled => :disabled
%td= select_tag :tm_repo_access, options_for_select(Repository.access_options, tm.repo_access), :class => "medium repo-access-select", :disabled => :disabled
%td= link_to 'Edit Access', edit_admin_team_member_path(tm), :class => "btn small"
%td= link_to 'Remove from team', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete, :class => "btn danger small"
= form_tag team_update_admin_project_path(@admin_project), :class => "bulk_import", :method => :put do
%table
@ -51,27 +70,8 @@
%td= select_tag :project_access, options_for_select(Project.access_options), :class => "project-access-select"
%td= select_tag :repo_access, options_for_select(Repository.access_options), :class => "repo-access-select"
%tr
%td{ :colspan => 3 }
= submit_tag 'Add', :class => "btn primary"
%table.round-borders
%thead
%tr
%th Name
%th Added
%th Project Access
%th Repository Access
%th
- @admin_project.users_projects.each do |tm|
%tr
%td
= link_to tm.user_name, admin_team_member_path(tm)
%td= time_ago_in_words(tm.updated_at) + " ago"
%td= select_tag :tm_project_access, options_for_select(Project.access_options, tm.project_access), :class => "project-access-select", :disabled => :disabled
%td= select_tag :tm_repo_access, options_for_select(Repository.access_options, tm.repo_access), :class => "repo-access-select", :disabled => :disabled
%td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
.actions
= submit_tag 'Add', :class => "btn primary"
:css
form select {