From 7da70b5f12d62fb1b885dc96ae42343d7c9282bc Mon Sep 17 00:00:00 2001
From: Alexander Machehin <alexander.machehin@gmail.com>
Date: Sun, 8 Sep 2013 17:56:43 +0600
Subject: [PATCH] [#277] profile projects 1 ver.

---
 .gitignore                                    |   5 +-
 app/assets/images/bg_blue.png                 | Bin 0 -> 176 bytes
 app/assets/images/profile-hover.png           | Bin 0 -> 2793 bytes
 app/assets/stylesheets/application.scss       |   1 +
 app/assets/stylesheets/design/custom.scss     |  40 +----
 app/assets/stylesheets/design/profile.scss    | 146 ++++++++++++++++++
 app/controllers/groups/profile_controller.rb  |   2 +-
 app/controllers/users/profile_controller.rb   |   2 +-
 app/helpers/commit_helper.rb                  |  11 +-
 .../partials/_git_new_push_notification.haml  |   4 +-
 app/views/shared/_profile.html.haml           |  33 ++--
 app/views/shared/_profile_projects.html.haml  |  11 ++
 config/locales/models/project.en.yml          |   3 +
 config/locales/models/project.ru.yml          |   3 +
 lib/modules/models/git.rb                     |   5 +
 15 files changed, 210 insertions(+), 56 deletions(-)
 create mode 100644 app/assets/images/bg_blue.png
 create mode 100644 app/assets/images/profile-hover.png
 create mode 100644 app/assets/stylesheets/design/profile.scss
 create mode 100644 app/views/shared/_profile_projects.html.haml

diff --git a/.gitignore b/.gitignore
index f98b0074d..7f6472601 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,7 @@ crash.log
 config/newrelic.yml
 config/deploy/*.rb
 config/deploy.rb
-*.swo
+.swo
+.swn
+.ruby-gemset
+.ruby-version
\ No newline at end of file
diff --git a/app/assets/images/bg_blue.png b/app/assets/images/bg_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..ecfede3608f8519fc1d6ef8a2b04d5e60afaa184
GIT binary patch
literal 176
zcmeAS@N?(olHy`uVBq!ia0vp^d_b(t!3HEfG<SvoDYhhUcNd2LAh=-f^2tCE&H|6f
zVg?3oVGw3ym^DWND9B#o>FdgVmqSK?pV_PC#U`MTt*47)h{y3{o}7Ch<~Q;jIO3ot
zan)i~VaVeZ#{zp7OSzl&`Sj`-9Q*(Oh^d`~q~yvJ<ufXaOod*%tjc6zxM#tA?})tb
QDxg6Op00i_>zopr07T|AxBvhE

literal 0
HcmV?d00001

diff --git a/app/assets/images/profile-hover.png b/app/assets/images/profile-hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..09427d06b060775f66208bcc66e99847dc11c28e
GIT binary patch
literal 2793
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

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index c908583cb..f54b1889b 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -4,3 +4,4 @@
 @import "design/common";
 @import "design/custom";
 @import "design/build_lists_monitoring";
+@import "design/profile";
diff --git a/app/assets/stylesheets/design/custom.scss b/app/assets/stylesheets/design/custom.scss
index b583bf3be..37ee3d4ee 100644
--- a/app/assets/stylesheets/design/custom.scss
+++ b/app/assets/stylesheets/design/custom.scss
@@ -1918,7 +1918,7 @@ table#myTable thead tr.search th form.button_to div input {
 }
 
 article .activity .top {
-  
+
   .created {
     margin-left: 50px;
     span, a {
@@ -1941,7 +1941,7 @@ article .activity .top {
     margin: 10px -7px;
     border-left: none;
     border-right: none;
-  }  
+  }
 }
 
 #assigned-container {
@@ -2058,7 +2058,7 @@ a.button.reject_publish, a.button.create_container {
             border-left: 12px solid #dcecfa;
             float: left;
         }
-    }    
+    }
 
 }
 
@@ -2105,37 +2105,3 @@ table tbody {
         cursor: default;
     }
 }
-
-.row {
-  .span3.profile {
-    .avatar {
-      float: left;
-      width: 81px;
-      height: 81px;
-    }
-    .base_info {
-      float: left;
-      width: 134px;
-      h3 {
-        margin: 0 0 0 10px;
-      }
-      p {
-        height: 35px;
-        margin-left: 10px;
-      }
-      a {
-        margin: 16px 0 0 10px;
-      }
-    }
-    p.first {
-      margin-top: 10px;
-    }
-    p.info {
-      max-width: 220px;
-    }
-  }
-}
-
-hr.profile_line {
-  margin-top: 20px;
-}
\ No newline at end of file
diff --git a/app/assets/stylesheets/design/profile.scss b/app/assets/stylesheets/design/profile.scss
new file mode 100644
index 000000000..1c351ac40
--- /dev/null
+++ b/app/assets/stylesheets/design/profile.scss
@@ -0,0 +1,146 @@
+.row {
+  .span3.profile {
+    .avatar {
+      float: left;
+      width: 81px;
+      height: 81px;
+    }
+    .base_info {
+      float: left;
+      width: 134px;
+      h3 {
+        margin: 0 0 0 10px;
+      }
+      p {
+        height: 35px;
+        margin-left: 10px;
+      }
+      a {
+        margin: 16px 0 0 10px;
+      }
+    }
+    p.first {
+      margin-top: 10px;
+    }
+    p.info {
+      max-width: 220px;
+    }
+  }
+}
+hr.profile_line {
+  margin-top: 20px;
+  margin: 20px 0 20px 0;
+  width: 870px;
+}
+.profile-content {
+  border: 5px solid #D4D4D4;
+  div.search {
+    //background: none repeat scroll 0 0 #FFFFFF;
+    border: 2px solid #D4D4D4;
+    float: left;
+    margin: 15px 10px;
+    width: 837px;
+  }
+  div.search div.pic {
+    background: url("/assets/search-button.png") repeat scroll 0 0 transparent;
+    float: left;
+    height: 22px;
+    width: 24px;
+  }
+  div.search div.field {
+    float: left;
+    margin: -1px 0 0;
+  }
+
+  div.search div.field input {
+    background: none repeat scroll 0 0 transparent;
+    border: medium none;
+    font-family: Arial;
+    font-size: 12px;
+    height: 18px;
+    padding: 2px 0 0;
+    width: 132px;
+  }
+  div.search div.field input.gray {
+    color: #CFCFCF;
+  }
+  div.search div.field input.black {
+    color: #333333;
+  }
+  table {
+    border: none;
+    border-collapse:collapse;
+    margin: 0 9px 10px 9px;
+    width: 844px;
+    th {
+      padding-left: 10px;
+      .project-link {
+        margin-top: 5px;
+      }
+    }
+    tr.odd {
+    }
+    tr.even {
+      background: #EDEDED;
+    }
+    .row-fluid {
+      max-height: 16px;
+      .span3 {
+        font-size: 10px;
+        font-weight: normal;
+        max-height: 16px;
+        min-height: 16px;
+      }
+      .span3.datetime_moment {
+        margin-right: 15px;
+        color: gray;
+      }
+    }
+  }
+  .span12.content {
+    background: url(/assets/bg_blue.png);
+    height: 30px;
+    margin-bottom: 0px;
+    nav {
+      ul {
+        list-style: none;
+        padding-left: 0;
+        margin: 4px 0 0 5px;
+        li {
+          text-decoration: none;
+          padding: 0 10px 6px 0;
+          a {
+            color: white;
+            font-weight: bold;
+            font-size: 14px;
+            padding: 0 10px 9px 10px;
+          }
+          a.active {
+            background: image-url("profile-hover.png") repeat-x scroll 0 100% transparent;
+          }
+        }
+      }
+    }
+  }
+  .span12.sub-menu {
+    height: 30px;
+    background: #EDEDED;
+    margin: 0;
+    box-shadow: none;
+    padding-left: 0px;
+    nav {
+      ul {
+        list-style: none;
+        padding: 0;
+        margin: 6px 0 0 5px;
+        a {
+          padding: 0 10px 9px 10px;
+        }
+        a.active {
+          background: image-url("profile-hover.png") repeat-x scroll 0 100% transparent;
+        }
+      }
+    }
+  }
+}
+
diff --git a/app/controllers/groups/profile_controller.rb b/app/controllers/groups/profile_controller.rb
index b6fb5000b..266c528b1 100644
--- a/app/controllers/groups/profile_controller.rb
+++ b/app/controllers/groups/profile_controller.rb
@@ -11,7 +11,7 @@ class Groups::ProfileController < Groups::BaseController
 
   def show
     @projects = @group.projects.opened.search(params[:search]).recent
-                      .paginate(:page => params[:page], :per_page => 25)
+                      .paginate(:page => params[:page], :per_page => 24)
   end
 
   def new
diff --git a/app/controllers/users/profile_controller.rb b/app/controllers/users/profile_controller.rb
index 80a1599df..b19d1b047 100644
--- a/app/controllers/users/profile_controller.rb
+++ b/app/controllers/users/profile_controller.rb
@@ -4,6 +4,6 @@ class Users::ProfileController < Users::BaseController
 
   def show
     @projects = @user.projects.opened.search(params[:search]).recent
-                     .paginate(:page => params[:page], :per_page => 25)
+                     .paginate(:page => params[:page], :per_page => 24)
   end
 end
diff --git a/app/helpers/commit_helper.rb b/app/helpers/commit_helper.rb
index 5110b2e9c..9fb195721 100644
--- a/app/helpers/commit_helper.rb
+++ b/app/helpers/commit_helper.rb
@@ -1,6 +1,5 @@
 # -*- encoding : utf-8 -*-
 module CommitHelper
-
   def render_commit_stats(stats)
     res = ["<table class='commit_stats'>"]
     ind=0
@@ -44,4 +43,14 @@ module CommitHelper
     u = User.where(:email => email).first
     u.present? ? link_to(name, user_path(u)) : mail_to(email, name)
   end
+
+  def commits_pluralize(commits_count)
+    Russian.p(commits_count, *commits_pluralization_arr)
+  end
+
+  protected
+
+  def commits_pluralization_arr
+    pluralize ||=  t('layout.commits.pluralize').map {|base, title| title.to_s}
+  end
 end
diff --git a/app/views/home/partials/_git_new_push_notification.haml b/app/views/home/partials/_git_new_push_notification.haml
index d144beed8..f9553f91f 100644
--- a/app/views/home/partials/_git_new_push_notification.haml
+++ b/app/views/home/partials/_git_new_push_notification.haml
@@ -15,6 +15,6 @@
         = commit[1]
         %br
       - if defined? other_commits
-        -pluralize =  t('layout.commits.pluralize').map {|base, title| title.to_s}
         %br
-        =link_to t('notifications.bodies.more_commits', :count => other_commits_count, :commits => Russian.p(other_commits_count, *pluralize)), diff_path(project_owner, project_name, :diff => other_commits)
+        =link_to t('notifications.bodies.more_commits', :count => other_commits_count, :commits => commits_pluralize(other_commits_count)),
+                 diff_path(project_owner, project_name, :diff => other_commits)
diff --git a/app/views/shared/_profile.html.haml b/app/views/shared/_profile.html.haml
index 119a93076..1c87bbe62 100644
--- a/app/views/shared/_profile.html.haml
+++ b/app/views/shared/_profile.html.haml
@@ -35,16 +35,23 @@
 
 %hr.profile_line{:color => 'dfe8ef', :size => '3'}
 
-.content
-  %h4= t("layout.projects.public_projects_list") + ":"
-  %p
-    =form_tag search_path, :id => 'filter_projects', :method => :get do
-      =tracker_search_field(:search, t('layout.find_project'))
-  %br
-  %p
-    - projects.each do |project|
-      = link_to project.name, project
-      %br
-  %br
-  = will_paginate projects
-  %br
+.row-fluid.profile-content
+  .span12.content
+    %nav
+      %ul
+        %li
+          = link_to t('layout.projects.list_header'), '#', :class => 'projects active'
+  .span12.sub-menu
+    %nav
+      %ul
+        %li= link_to t('layout.projects.public'),  '#', :class => "public-projects #{@public ? 'active' : ''}"
+        %li= link_to t('layout.projects.private'), '#', :class => "private-projects #{!@public ? 'active' : ''}"
+  .search
+    .pic
+    .field= text_field_tag 'query', @query, :placeholder => t('layout.find_project')
+
+  %table.profile-table
+    %tbody= render 'shared/profile_projects', :projects => projects
+%br
+= will_paginate projects
+
diff --git a/app/views/shared/_profile_projects.html.haml b/app/views/shared/_profile_projects.html.haml
new file mode 100644
index 000000000..3762c49a7
--- /dev/null
+++ b/app/views/shared/_profile_projects.html.haml
@@ -0,0 +1,11 @@
+- pr_groups = projects.in_groups(2)
+- pr_groups[0].each_with_index do |project, ind|
+  %tr{:class => ind.odd? ? 'odd' : 'even'}
+    - [project, pr_groups[1][ind]].each do |project|
+      %th
+        - if project.present?
+          .project-link= link_to project.name, project
+          .row-fluid
+            = datetime_moment project.updated_at, :class => :span3
+            - commits_count = project.total_commits_count
+            .span3= "#{commits_count > 10000 ? '10000+' : commits_count} #{commits_pluralize(commits_count)}"
diff --git a/config/locales/models/project.en.yml b/config/locales/models/project.en.yml
index 542571860..d616729d1 100644
--- a/config/locales/models/project.en.yml
+++ b/config/locales/models/project.en.yml
@@ -71,6 +71,9 @@ en:
       current_commit: Current commit
       files_in_project: Files in
 
+      public: Public
+      private: Private
+
   flash:
     project:
       saved: Project saved
diff --git a/config/locales/models/project.ru.yml b/config/locales/models/project.ru.yml
index 560f96151..5360e237c 100644
--- a/config/locales/models/project.ru.yml
+++ b/config/locales/models/project.ru.yml
@@ -71,6 +71,9 @@ ru:
         cloning: Клонирование этого репозитория
         remote: Добавление этого репозитория как удаленного к существующему локальному репозиторию
 
+      public: Публичные
+      private: Приватные
+
   flash:
     project:
       saved: Проект успешно сохранен
diff --git a/lib/modules/models/git.rb b/lib/modules/models/git.rb
index 032d8bb57..246652074 100644
--- a/lib/modules/models/git.rb
+++ b/lib/modules/models/git.rb
@@ -115,6 +115,11 @@ module Modules
         repo.branches.count == 0
       end
 
+      def total_commits_count
+        return 0 if is_empty?
+        %x(cd #{path} && git rev-list --all | wc -l).to_i
+      end
+
       protected
 
       def build_path(dir)