started cleaning UI

Dmitriy Zaporozhets
1 parent 1ee69714
Showing 10 changed files with 38 additions and 29 deletions Show diff stats
app/assets/stylesheets/projects.css.scss
app/controllers/projects_controller.rb
app/controllers/team_members_controller.rb
app/models/project.rb
app/views/projects/_feed.html.haml
app/views/projects/_project_head.html.haml
app/views/repositories/_head.html.haml
app/views/team_members/_form.html.haml
app/views/team_members/new.html.haml
app/views/team_members/new.js.haml
@@ -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;
+    }
+  }
+}
@@ -69,7 +69,7 @@ class ProjectsController &lt; 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
@@ -18,7 +18,11 @@ class TeamMembersController &lt; 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
@@ -300,11 +300,11 @@ class Project &lt; 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]
@@ -40,8 +40,6 @@
         %span.update-title
           %span.commit.tag
             Project Wall
-        %span.update-author
-          \...
 - elsif update.kind_of?(MergeRequest)
-.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
-.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
-= 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
@@ -0,0 +1 @@
+= render "team_members/form"
@@ -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();
-  });
-
	@@ -745,16 +745,7 @@ a.project-update.titled {		@@ -745,16 +745,7 @@ a.project-update.titled {
745		745
746	.add_new {	746	.add_new {
747	float:right;	747	float:right;
748	- padding: 5px 12px;
749	- border: 1px solid #CCC;
750	-
751	- &:hover {
752	- background:#eee;
753	- }
754	-
755	- &:active {
756	- background:#ddd;
757	- }	748	+ padding: 6px 12px;
758	}	749	}
759		750
760	.tree_progress {	751	.tree_progress {
	@@ -845,3 +836,26 @@ tr.line_notes_row {		@@ -845,3 +836,26 @@ tr.line_notes_row {
845	color:#2FA0BB;	836	color:#2FA0BB;
846	}	837	}
847	}	838	}
		839	+
		840	+.top-tabs {
		841	+ margin: 0;
		842	+ padding: 5px;
		843	+ font-size: 14px;
		844	+ padding-bottom:10px;
		845	+ margin-bottom:20px;
		846	+ height:26px;
		847	+ border-bottom:1px solid #ccc;
		848	+
		849	+ .tab {
		850	+ font-weight: bold;
		851	+ background:none;
		852	+ padding: 10px;
		853	+ float:left;
		854	+ padding-left:0px;
		855	+ padding-right:40px;
		856	+
		857	+ &.active {
		858	+ color: #2FA0BB;
		859	+ }
		860	+ }
		861	+}
	@@ -69,7 +69,7 @@ class ProjectsController < ApplicationController		@@ -69,7 +69,7 @@ class ProjectsController < ApplicationController
69	def show	69	def show
70	return render "projects/empty" unless @project.repo_exists? && @project.has_commits?	70	return render "projects/empty" unless @project.repo_exists? && @project.has_commits?
71	limit = (params[:limit] \|\| 20).to_i	71	limit = (params[:limit] \|\| 20).to_i
72	- @activities = @project.updates_wo_repo(limit)	72	+ @activities = @project.activities(limit)#updates_wo_repo(limit)
73	end	73	end
74		74
75	def files	75	def files
	@@ -300,11 +300,11 @@ class Project < ActiveRecord::Base		@@ -300,11 +300,11 @@ class Project < ActiveRecord::Base
300	end[0...n]	300	end[0...n]
301	end	301	end
302		302
303	- def updates_wo_repo(n=3)	303	+ def activities(n=3)
304	[	304	[
305	fresh_issues(n),	305	fresh_issues(n),
306	fresh_merge_requests(n),	306	fresh_merge_requests(n),
307	- fresh_notes(n)	307	+ notes.inc_author_project.where("noteable_type is not null").order("created_at desc").first(n)
308	].compact.flatten.sort do \|x, y\|	308	].compact.flatten.sort do \|x, y\|
309	y.created_at <=> x.created_at	309	y.created_at <=> x.created_at
310	end[0...n]	310	end[0...n]
	@@ -40,8 +40,6 @@		@@ -40,8 +40,6 @@
40	%span.update-title	40	%span.update-title
41	%span.commit.tag	41	%span.commit.tag
42	Project Wall	42	Project Wall
43	- %span.update-author
44	- \...
45		43
46		44
47	- elsif update.kind_of?(MergeRequest)	45	- elsif update.kind_of?(MergeRequest)
1	-.merge-tabs	1	+.top-tabs
2	= link_to project_path(@project), :class => "activities-tab tab #{'active' if current_page?(project_path(@project)) }" do	2	= link_to project_path(@project), :class => "activities-tab tab #{'active' if current_page?(project_path(@project)) }" do
3	%span	3	%span
4	Activities	4	Activities
	@@ -23,5 +23,5 @@		@@ -23,5 +23,5 @@
23		23
24	- if current_page?(team_project_path(@project))	24	- if current_page?(team_project_path(@project))
25	- if can? current_user, :admin_team_member, @project	25	- if can? current_user, :admin_team_member, @project
26	- = link_to new_project_team_member_path(@project), :class => "add_new", :title => "New Team Member", :remote => true do	26	+ = link_to new_project_team_member_path(@project), :class => "add_new", :title => "New Team Member" do
27	= image_tag "add_new.png", :width => 14	27	= image_tag "add_new.png", :width => 14
1	-.merge-tabs.repository	1	+.top-tabs.repository
2	= link_to project_repository_path(@project), :class => "activities-tab tab #{'active' if current_page?(project_repository_path(@project)) }" do	2	= link_to project_repository_path(@project), :class => "activities-tab tab #{'active' if current_page?(project_repository_path(@project)) }" do
3	%span	3	%span
4	Activities	4	Activities
1	-= form_for @team_member, :as => :team_member, :url => project_team_members_path(@project, @team_member), :remote => "true" do \|f\|	1	+= form_for @team_member, :as => :team_member, :url => project_team_members_path(@project, @team_member) do \|f\|
2	%div	2	%div
3	%span.entity-info	3	%span.entity-info
4	- if request.xhr?	4	- if request.xhr?
5	- = link_to "#back", :onclick => "backToMembers();" do	5	+ = link_to project_team_members_path(@project) do
6	.entity-button	6	.entity-button
7	Team List	7	Team List
8	%i	8	%i
	@@ -1,8 +0,0 @@	@@ -1,8 +0,0 @@
1	-:plain
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();
7	- });
8	-