Download as
Browse Code »

Commit 09b877ef29a0c641457eb986c5b228d003c51c16

Authored by Dmitriy Zaporozhets
1 parent 621491c6
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

remove modal window from team member managment

Showing 7 changed files with 54 additions and 42 deletions   Show diff stats
app/assets/javascripts/team.js 0 → 100644
  Diff comments   View file @09b877e
... ... @@ -0,0 +1,8 @@
  1 +function backToMembers(){
  2 + $("#team_member_new").hide("slide", { direction: "right" }, 150, function(){
  3 + $("#team-table").show("slide", { direction: "left" }, 150, function() {
  4 + $("#team_member_new").remove();
  5 + $(".add_new").show();
  6 + });
  7 + });
  8 +}
... ...
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @09b877e
... ... @@ -815,7 +815,7 @@ tr.line_notes_row {
815 815 width:28px;
816 816 height:27px;
817 817 top: -12px;
818   - border: 1px solid #474D57;
  818 + border: 1px solid #CCC;
819 819 border-radius: 3px;
820 820 background: #fff;
821 821  
... ...
app/views/projects/team.html.haml
  Diff comments   View file @09b877e
1 1 = render "project_head"
2   -%div
3   - = render :partial => "team", :locals => {:project => @project}
  2 += render :partial => "team", :locals => {:project => @project}
4 3  
... ...
app/views/team_members/_form.html.haml
  Diff comments   View file @09b877e
1   -%div
2   - = form_for @team_member, :as => :team_member, :url => project_team_members_path(@project, @team_member), :remote => "true" do |f|
3   - -if @team_member.errors.any?
4   - %ul
5   - - @team_member.errors.full_messages.each do |msg|
6   - %li= msg
  1 += form_for @team_member, :as => :team_member, :url => project_team_members_path(@project, @team_member), :remote => "true" do |f|
  2 + %div
  3 + %span.entity-info
  4 + - if request.xhr?
  5 + = link_to "#back", :onclick => "backToMembers();" do
  6 + .entity-button
  7 + Team List
  8 + %i
  9 + %h2= "New Team member"
7 10  
8   - .span-6.append-bottom
9   - %b Name
10   - .span-6
11   - = f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, { :style => "width:300px" })
12   - .span-6
13   - %b Project Access:
14   - .span-6
15   - = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, :class => "project-access-select"
  11 + %hr
  12 + -if @team_member.errors.any?
  13 + %ul
  14 + - @team_member.errors.full_messages.each do |msg|
  15 + %li= msg
16 16  
17   - .span-6
18   - %b Repository Access:
19   - .span-6
20   - = f.select :repo_access, options_for_select(Repository.access_options, @team_member.repo_access), {}, :class => "repo-access-select"
21   - %br
22   - .span-6
23   - = f.submit 'Save', :class => "grey-button"
  17 + .span-6.append-bottom
  18 + %b Name
  19 + .span-6
  20 + = f.select(:user_id, User.not_in_project(@project).all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, { :style => "width:300px" })
  21 + .span-6
  22 + %b Project Access:
  23 + .span-6
  24 + = f.select :project_access, options_for_select(Project.access_options, @team_member.project_access), {}, :class => "project-access-select"
  25 +
  26 + .span-6
  27 + %b Repository Access:
  28 + .span-6
  29 + = f.select :repo_access, options_for_select(Repository.access_options, @team_member.repo_access), {}, :class => "repo-access-select"
  30 + %br
  31 + .merge-tabs
  32 + = f.submit 'Save', :class => "grey-button"
24 33  
... ...
app/views/team_members/create.js.haml
  Diff comments   View file @09b877e
1 1 - if @team_member.valid?
2 2 :plain
3   - $("#new_tm_dialog").dialog("close");
4   - $("#team-table").append("#{escape_javascript(render(:partial => 'show', :locals => {:member => @team_member} ))}");
  3 + $("#team_member_new").hide("slide", { direction: "right" }, 150, function(){
  4 + $("#team-table").show("slide", { direction: "left" }, 150, function() {
  5 + $("#team_member_new").remove();
  6 + $("#team-table").replaceWith("#{escape_javascript(render('projects/team'))}");
  7 + $(".add_new").show();
  8 + });
  9 + });
5 10 - else
6 11 :plain
7   - $("#new_tm_dialog").empty();
8   - $("#new_tm_dialog").append("#{escape_javascript(render('form'))}");
  12 + $("#team_member_new").replaceWith("#{escape_javascript(render('form'))}");
9 13 $('select#team_member_user_id').chosen();
... ...
app/views/team_members/new.js.haml
  Diff comments   View file @09b877e
1   --#$("#new-member-holder").empty();
2   --#$("#new-member-holder").append("#{escape_javascript(render('form'))}");
3 1 :plain
4   - var new_tm_dialog = $("<div id='new_tm_dialog'></div>");
5   - new_tm_dialog.html("#{escape_javascript(render('form'))}");
6   - $(new_tm_dialog).dialog({
7   - width: 350,
8   - resizable: false,
9   - draggable: false,
10   - title: "Add new member to project team",
11   - close: function(event, ui) { $("#new_tm_dialog").remove();},
12   - modal: true
13   -
  2 + $("#team-table").hide("slide", { direction: "left" }, 150, function(){
  3 + $(this).parent().append("#{escape_javascript(render('form'))}");
  4 + $('#team_member_new select#team_member_user_id').chosen();
  5 + $("#team_member_new").show("slide", { direction: "right" }, 150);
  6 + $(".add_new").hide();
14 7 });
15 8  
16   - $('#team_member_new select#team_member_user_id').chosen();
... ...
spec/requests/team_members_spec.rb
  Diff comments   View file @09b877e
... ... @@ -26,7 +26,7 @@ describe &quot;TeamMembers&quot; do
26 26 end
27 27  
28 28 it "should open new team member popup" do
29   - page.should have_content("Add new member to project")
  29 + page.should have_content("New Team member")
30 30 end
31 31  
32 32 describe "fill in" do
... ...