started cleaning UI

10 files changed, 38 insertions, 29 deletions

diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index 439bba82f46..ca9001b4c3c 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -745,16 +745,7 @@ a.project-update.titled {
 
 .add_new { 
   float:right;
-  padding: 5px 12px;
-  border: 1px solid #CCC;
-
-  &:hover { 
-    background:#eee;
-  }
-
-  &:active { 
-    background:#ddd;
-  }
+  padding: 6px 12px;
 }
 
 .tree_progress { 
@@ -845,3 +836,26 @@ tr.line_notes_row {
     color:#2FA0BB;
   }
 }
+
+.top-tabs { 
+  margin: 0; 
+  padding: 5px;
+  font-size: 14px;
+  padding-bottom:10px;
+  margin-bottom:20px;
+  height:26px;
+  border-bottom:1px solid #ccc;
+
+  .tab { 
+    font-weight: bold;
+    background:none;
+    padding: 10px;
+    float:left;
+    padding-left:0px;
+    padding-right:40px;
+
+    &.active {
+      color: #2FA0BB;
+    }
+  }
+}
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 69e1cc3645b..6bd72a860b3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -69,7 +69,7 @@ class ProjectsController < ApplicationController
   def show
     return render "projects/empty" unless @project.repo_exists? && @project.has_commits?
     limit = (params[:limit] || 20).to_i
-    @activities = @project.updates_wo_repo(limit)
+    @activities = @project.activities(limit)#updates_wo_repo(limit)
   end
 
   def files
diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb
index d9a7e29be04..c05602f9a80 100644
--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
@@ -18,7 +18,11 @@ class TeamMembersController < ApplicationController
   def create
     @team_member = UsersProject.new(params[:team_member])
     @team_member.project = project
-    @team_member.save
+    if @team_member.save
+      redirect_to team_project_path(@project)
+    else
+      render "new"
+    end
   end
 
   def update
diff --git a/app/models/project.rb b/app/models/project.rb
index 10a5ffd0bce..6650ccba224 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -300,11 +300,11 @@ class Project < ActiveRecord::Base
     end[0...n]
   end
 
-  def updates_wo_repo(n=3)
+  def activities(n=3)
     [
       fresh_issues(n),
       fresh_merge_requests(n),
-      fresh_notes(n)
+      notes.inc_author_project.where("noteable_type is not null").order("created_at desc").first(n)
     ].compact.flatten.sort do |x, y|
       y.created_at <=> x.created_at
     end[0...n]
diff --git a/app/views/projects/_feed.html.haml b/app/views/projects/_feed.html.haml
index f698342157d..4f8e59f8c51 100644
--- a/app/views/projects/_feed.html.haml
+++ b/app/views/projects/_feed.html.haml
@@ -40,8 +40,6 @@
         %span.update-title
           %span.commit.tag
             Project Wall
-        %span.update-author
-          \...
 
 
 - elsif update.kind_of?(MergeRequest)
diff --git a/app/views/projects/_project_head.html.haml b/app/views/projects/_project_head.html.haml
index dd15559bc8e..6478853d77d 100644
--- a/app/views/projects/_project_head.html.haml
+++ b/app/views/projects/_project_head.html.haml
@@ -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
diff --git a/app/views/repositories/_head.html.haml b/app/views/repositories/_head.html.haml
index 82a22807634..09a85bed591 100644
--- a/app/views/repositories/_head.html.haml
+++ b/app/views/repositories/_head.html.haml
@@ -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
diff --git a/app/views/team_members/_form.html.haml b/app/views/team_members/_form.html.haml
index 5ae0d197a11..e3ba64c5fad 100644
--- a/app/views/team_members/_form.html.haml
+++ b/app/views/team_members/_form.html.haml
@@ -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
diff --git a/app/views/team_members/new.html.haml b/app/views/team_members/new.html.haml
new file mode 100644
index 00000000000..4f70fb4b046
--- /dev/null
+++ b/app/views/team_members/new.html.haml
@@ -0,0 +1 @@
+= render "team_members/form"
diff --git a/app/views/team_members/new.js.haml b/app/views/team_members/new.js.haml
deleted file mode 100644
index 9fc776bb2d6..00000000000
--- a/app/views/team_members/new.js.haml
+++ /dev/null
@@ -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();
-  });
-