started cleaning UI

This commit is contained in:
Dmitriy Zaporozhets 2012-01-14 23:46:06 +02:00
parent 1ee69714df
commit d95cfc6144
10 changed files with 38 additions and 29 deletions

View file

@ -40,8 +40,6 @@
%span.update-title
%span.commit.tag
Project Wall
%span.update-author
\...
- elsif update.kind_of?(MergeRequest)

View file

@ -1,4 +1,4 @@
.merge-tabs
.top-tabs
= link_to project_path(@project), :class => "activities-tab tab #{'active' if current_page?(project_path(@project)) }" do
%span
Activities
@ -23,5 +23,5 @@
- if current_page?(team_project_path(@project))
- if can? current_user, :admin_team_member, @project
= link_to new_project_team_member_path(@project), :class => "add_new", :title => "New Team Member", :remote => true do
= link_to new_project_team_member_path(@project), :class => "add_new", :title => "New Team Member" do
= image_tag "add_new.png", :width => 14

View file

@ -1,4 +1,4 @@
.merge-tabs.repository
.top-tabs.repository
= link_to project_repository_path(@project), :class => "activities-tab tab #{'active' if current_page?(project_repository_path(@project)) }" do
%span
Activities

View file

@ -1,8 +1,8 @@
= form_for @team_member, :as => :team_member, :url => project_team_members_path(@project, @team_member), :remote => "true" do |f|
= form_for @team_member, :as => :team_member, :url => project_team_members_path(@project, @team_member) do |f|
%div
%span.entity-info
- if request.xhr?
= link_to "#back", :onclick => "backToMembers();" do
= link_to project_team_members_path(@project) do
.entity-button
Team List
%i

View file

@ -0,0 +1 @@
= render "team_members/form"

View file

@ -1,8 +0,0 @@
:plain
$("#team-table").hide("slide", { direction: "left" }, 150, function(){
$(this).parent().append("#{escape_javascript(render('form'))}");
$('#team_member_new select#team_member_user_id').chosen();
$("#team_member_new").show("slide", { direction: "right" }, 150);
$(".add_new").hide();
});