diff --git a/app/views/admin/projects/edit.html.haml b/app/views/admin/projects/edit.html.haml index 9d9a1ee0..3a1591b1 100644 --- a/app/views/admin/projects/edit.html.haml +++ b/app/views/admin/projects/edit.html.haml @@ -1,5 +1,4 @@ = render 'form' -= link_to 'Show', [:admin, @admin_project] -\| -= link_to 'Back', admin_projects_path += link_to 'Back', admin_projects_path, :class => "right lbutton" += link_to 'Show', [:admin, @admin_project], :class => "right lbutton" \ No newline at end of file diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index c529b82e..7ae9397c 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -20,7 +20,5 @@ %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 -%br - = paginate @admin_projects -= link_to 'New Project', new_admin_project_path += link_to 'New Project', new_admin_project_path, :class => "lbutton" diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 9f7405c7..89b9afa8 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -1,38 +1,53 @@ - unless notice.nil? %p#notice= notice -#infoblock - %h2= @admin_project.name - %p - %b Name: - = @admin_project.name - %p - %b Code: - = @admin_project.code - %p - %b Path: - = @admin_project.path - %p - %b Description: - = @admin_project.description +%h2= @admin_project.name + +%table.round-borders + %tr + %td + %b + Name: + %td + = @admin_project.name + %tr + %td + %b + Code: + %td + = @admin_project.code + %tr + %td + %b + Path: + %td + = @admin_project.path + %tr + %td + %b + Description: + %td + = @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) - \| - = link_to 'Back', admin_projects_path .span-14 %h2 Team %table.round-borders - %tr - %th Name - %th Added - %th Web - %th Git - %th Admin - %th + %thead + %tr + %th Name + %th Added + %th Web + %th Git + %th Admin + %th - @admin_project.users_projects.each do |tm| %tr @@ -43,4 +58,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}) + = link_to 'New Team Member', new_admin_team_member_path(:team_member => {:project_id => @admin_project.id}), :class => "lbutton"