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

button common style + flash messages fix

Browse source
This commit is contained in:
gitlabhq 2011-11-21 02:26:10 -05:00
parent 46bebac983
commit 31e51dd116
28 changed files with 80 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,9 +29,9 @@
%br
= f.text_area :description
.clear
%hr
%br
.actions
= f.submit 'Save', :class => "lbutton"
= f.submit 'Save', :class => "grey-button"
:javascript
$(function(){

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

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

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

@ -7,7 +7,6 @@
%th Last Commit
%th
%th
%th
- @admin_projects.each do |project|
%tr
@ -16,9 +15,8 @@
%td= project.path
%td= project.users_projects.count
%td= last_commit(project)
%td= link_to 'Show', [:admin, 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
= paginate @admin_projects
= link_to 'New Project', new_admin_project_path, :class => "lbutton"
= link_to 'New Project', new_admin_project_path, :class => "grey-button"

3
app/views/admin/projects/new.html.haml
View file

@ -2,4 +2,5 @@
= render 'form'
= link_to 'Back', admin_projects_path, :class => 'right lbutton'
%br
= link_to 'Back', admin_projects_path, :class => ''

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

@ -31,8 +31,7 @@
= @admin_project.description
%tr
%td{:colspan => 2}
= link_to 'Edit', edit_admin_project_path(@admin_project), :class => "lbutton"
= link_to 'Back', admin_projects_path, :class => "right lbutton"
= link_to 'Edit', edit_admin_project_path(@admin_project), :class => "grey-button"
.span-14
@ -58,4 +57,4 @@
%td.span-2= check_box_tag "admin", 1, @admin_project.admins.include?(tm.user), :disabled => :disabled
%td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
= link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}), :class => "lbutton"
= link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}), :class => "grey-button"

51
app/views/admin/team_members/_form.html.haml
View file

@ -6,29 +6,32 @@
- @admin_team_member.errors.full_messages.each do |msg|
%li= msg
.span-10
- if @admin_team_member.new_record?
.field
= f.label :user_id
%br
= f.select :user_id, User.all.map { |user| [user.name, user.id] }
.field
= f.label :project_id
%br
= f.select :project_id, Project.all.map { |user| [user.name, user.id] }
.span-10
- if @admin_team_member.new_record?
.span-6
%b Access:
.span-8
= f.check_box :read
Web Access (Browse Repo)
.span-8
= f.check_box :write
Git Access (User will be added to commiters list)
.span-6.append-bottom
= f.check_box :admin
Admin (Can manage project)
%hr
= f.label :user_id
.span-6
= f.select :user_id, User.all.map { |user| [user.name, user.id] }
.span-6
= f.label :project_id
.span-6
= f.select :project_id, Project.all.map { |user| [user.name, user.id] }
.span-6
%b Access:
.span-6
= f.check_box :read
Web Access (Browse Repo)
.span-6
= f.check_box :write
Git Access (User will be added to commiters list)
.span-6
= f.check_box :admin
Admin (Can manage project)
%br
.actions
= f.submit 'Save'
= f.submit 'Save', :class => "grey-button"
:javascript
$('select#team_member_user_id').selectmenu({width:300});
$('select#team_member_project_id').selectmenu({width:300});

1
app/views/admin/team_members/edit.html.haml
View file

@ -1,5 +1,6 @@
= render 'form'
%br
= link_to 'Show', admin_team_member_path(@admin_team_member)
\|
= link_to 'Back', admin_team_members_path

4
app/views/admin/team_members/index.html.haml
View file

@ -10,7 +10,6 @@
%th Added
%th
%th
%th
- members.each do |tm|
- user = tm.user
%tr
@ -20,11 +19,10 @@
%td.span-1= check_box_tag "commit", 1, project.writers.include?(user), :disabled => :disabled
%td.span-2= check_box_tag "admin", 1, project.admins.include?(user), :disabled => :disabled
%td.span-3= time_ago_in_words(tm.updated_at) + " ago"
%td= link_to 'Show', admin_team_member_path(tm)
%td= link_to 'Edit', edit_admin_team_member_path(tm), :id => "edit_#{dom_id(tm)}"
%td= link_to 'Destroy', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
%br
= paginate @admin_team_members
= link_to 'New Team Member', new_admin_team_member_path
= link_to 'New Team Member', new_admin_team_member_path, :class => "grey-button"

1
app/views/admin/team_members/new.html.haml
View file

@ -2,4 +2,5 @@
= render 'form'
%br
= link_to 'Back', admin_team_members_path

13
app/views/admin/team_members/show.html.haml
View file

@ -1,5 +1,3 @@
%p#notice= notice
#infoblock
%p
%b Name:
@ -9,22 +7,25 @@
= @admin_team_member.project.name
%p
%b Since:
= @admin_team_member.updated_at
= @admin_team_member.updated_at.stamp("Nov 11, 2010")
#infoblock
.span-6
%b Access:
.span-8
%br
.span-6
= check_box_tag "read", 1, @admin_team_member.read, :disabled => :disabled
Web Access (Browse Repo)
.span-8
%br
.span-6
= check_box_tag "commit", 1, @admin_team_member.write, :disabled => :disabled
Git Access (User will be added to commiters list)
%br
.span-6.append-bottom
= check_box_tag "admin", 1, @admin_team_member.admin, :disabled => :disabled
Admin (Can manage project)
%hr
%br
= link_to 'Edit', edit_admin_team_member_path(@admin_project)
\|

4
app/views/admin/users/_form.html.haml
View file

@ -44,6 +44,6 @@
%br
= f.text_field :twitter
.clear
%hr
%br
.actions
= f.submit 'Save', :class => "lbutton"
= f.submit 'Save', :class => "grey-button"

6
app/views/admin/users/edit.html.haml
View file

@ -1,4 +1,6 @@
= render 'form'
= link_to 'Back', admin_users_path, :class => "right lbutton"
= link_to 'Show', [:admin, @admin_user], :class => "right lbutton"
%br
= link_to 'Back', admin_users_path, :class => ""
|
= link_to 'Show', [:admin, @admin_user], :class => ""

5
app/views/admin/users/index.html.haml
View file

@ -6,7 +6,6 @@
%th Projects
%th
%th
%th
- @admin_users.each do |user|
%tr
@ -14,9 +13,9 @@
%td= link_to user.name, [:admin, user]
%td= user.email
%td= user.users_projects.count
%td= link_to 'Show', [:admin, user]
%td= link_to 'Edit', edit_admin_user_path(user), :id => "edit_#{dom_id(user)}"
%td= link_to 'Destroy', [:admin, user], :confirm => 'Are you sure?', :method => :delete
= paginate @admin_users
= link_to 'New User', new_admin_user_path, :class => "lbutton"
%br
= link_to 'New User', new_admin_user_path, :class => "grey-button"

3
app/views/admin/users/new.html.haml
View file

@ -2,4 +2,5 @@
= render 'form'
= link_to 'Back', admin_users_path, :class => "right lbutton"
%br
= link_to 'Back', admin_users_path, :class => ""

6
app/views/admin/users/show.html.haml
View file

@ -44,8 +44,7 @@
= @admin_user.twitter
%tr
%td{:colspan => 2}
= link_to 'Edit', edit_admin_user_path(@admin_user), :class => "lbutton"
= link_to 'Back', admin_users_path, :class => "right lbutton"
= link_to 'Edit', edit_admin_user_path(@admin_user), :class => "grey-button"
.span-14
%h2 Projects
@ -59,6 +58,7 @@
%th Git
%th Admin
%th
%th
- @admin_user.users_projects.each do |tm|
- project = tm.project
@ -71,4 +71,4 @@
%td= link_to 'Edit', edit_admin_team_member_path(tm)
%td= link_to 'Cancel', admin_team_member_path(tm), :confirm => 'Are you sure?', :method => :delete
= link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "lbutton"
= link_to 'Add To Another Project', new_admin_team_member_path(:team_member => {:user_id => @admin_user.id}), :class => "grey-button"