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 000000000..ecfede360 Binary files /dev/null and b/app/assets/images/bg_blue.png differ diff --git a/app/assets/images/profile-hover.png b/app/assets/images/profile-hover.png new file mode 100644 index 000000000..09427d06b Binary files /dev/null and b/app/assets/images/profile-hover.png differ 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 = ["