Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#369: updated UI for User profile

This commit is contained in:
Vokhmin Alexey V 2014-11-13 03:17:22 +03:00
parent f360f83588
commit 6bf4576b34
21 changed files with 180 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/angular-new/groups/profile_controller.js.coffee → app/assets/javascripts/angular-new/controllers/profile_controller.js.coffee
View File

@ -1,6 +1,6 @@
RosaABF.controller 'Groups::ProfileController', ['$scope', '$http', '$location', ($scope, $http, $location) ->
RosaABF.controller 'ProfileController', ['$scope', '$http', '$location', ($scope, $http, $location) ->
$scope.group = $('#group_uname').val()
$scope.subject = $('#subject_uname').val()
$scope.processing = true
$scope.projects = []
$scope.page = null
@ -22,7 +22,7 @@ RosaABF.controller 'Groups::ProfileController', ['$scope', '$http', '$location',
page: $scope.page
format: 'json'
$http.get Routes.user_path($scope.group), params: params
$http.get Routes.user_path($scope.subject), params: params
.success (data) ->
$scope.projects = data.projects
$scope.total_items = data.total_items

7
app/assets/javascripts/angular-new/controllers/statistics_controller.js.coffee
View File

@ -135,7 +135,12 @@ RosaABF.controller 'StatisticsController', ['$scope', '$http', '$timeout', ($sco
options =
responsive: true
context = $(id)[0].getContext('2d')
chart = $(id)
chart.attr
width: chart.parent().width()
height: chart.parent().outerHeight()
context = chart[0].getContext('2d')
$scope.charts[id] = new Chart(context).Line(data, options)
$scope.initBuildListsChart = ->

4
app/assets/stylesheets/views/statistics.css.sass
View File

@ -10,7 +10,9 @@
.graph-key-color5
background-color: #ffbb78
.graph-wrapper span
.graph-wrapper
min-height: 300px
span
display: inline-block
width: 10px
height: 10px

1
app/controllers/groups/profile_controller.rb
View File

@ -27,7 +27,6 @@ class Groups::ProfileController < Groups::BaseController
@projects = @projects.paginate(paginate_params)
end
end
end
def new

2
app/controllers/users/base_controller.rb
View File

@ -1,4 +1,6 @@
class Users::BaseController < ApplicationController
layout 'bootstrap'
before_filter :authenticate_user!
before_filter :find_user

29
app/controllers/users/profile_controller.rb
View File

@ -1,26 +1,25 @@
class Users::ProfileController < Users::BaseController
include PaginateHelper
skip_before_filter :authenticate_user!, only: :show if APP_CONFIG['anonymous_access']
def show
@path, page = user_path, params[:page].to_i
@projects = @user.own_projects.search(params[:search]).recent
if request.xhr?
if params[:visibility] != 'hidden'
@projects = @projects.opened
@hidden = true
else
respond_to do |format|
format.html do
@groups = @user.groups.order(:uname)
end
format.json do
@projects = @user.own_projects.search(params[:term]).recent
case params[:visibility]
when 'hidden'
@projects = @projects.by_visibilities('hidden').accessible_by(current_ability, :read)
end
render partial: 'shared/profile_projects', layout: nil, locals: {projects: paginate_projects(page)}
else
@projects = @projects.opened
@projects = paginate_projects(page)
end
@total_items = @projects.count
@projects = @projects.paginate(paginate_params)
end
end
end
protected
def paginate_projects(page)
@projects.paginate(page: (page>0 ? page : nil), per_page: 24)
end
end

2
app/helpers/paginate_helper.rb
View File

@ -22,7 +22,7 @@ module PaginateHelper
def angularjs_paginate(options = {})
options.reverse_merge!(
{
per_page: params[:per_page].to_i > 0 ? params[:per_page] : 25,
per_page: params[:per_page].to_i > 0 ? params[:per_page] : 20,
total_items: 'total_items',
page: 'page',
select_page: "goToPage(page)"

7
app/views/groups/profile/show.html.slim
View File

@ -16,11 +16,10 @@
= @group.description
hr
.row
.col-md-8.col-md-offset-1 ng-controller='Groups::ProfileController'
.col-md-8.col-md-offset-1 ng-controller='ProfileController'
= simple_form_for :project, html: { 'ng-submit' => 'search()', id: 'search_projects_form' } do |f|
= hidden_field_tag 'group_uname', @group.uname
= hidden_field_tag 'page'
= hidden_field_tag 'subject_uname', @group.uname
.row
- if current_user
@ -51,7 +50,7 @@ hr
tr ng-repeat='project in projects'
td
h4
a ng-href='project.path'
a ng-href='{{project.path}}'
| {{project.name}}
p
| {{project.description}}

55
app/views/shared/_profile.html.haml
View File

@ -1,55 +0,0 @@
- edit_url ||= nil
- user ||= nil
- group ||= nil
- name ||= uname
- desc, desc_title = if user
- [user.professional_experience, t('activerecord.attributes.user.professional_experience')]
- else
- [group.description , t('activerecord.attributes.group.description')]
- max_length = 35
= hidden_field_tag :profile_path, @profile_path
.row
.span3.profile
.avatar= image_tag avatar_url(user || group, :big), alt: (user || group).uname
.base_info
%h3{title: uname}= title short_message(uname, 16)
%p{title: user.try(:name)}
- if user
= short_message(user.name, 28)
= link_to image_tag('gears.png'), edit_url if edit_url.present?
.both
- if user
- unless user.hide_email?
%p.info.first
- message = "#{t 'activerecord.attributes.user.email'}: "
= message
= mail_to user.email, short_message(user.email, max_length - message.length), encode: 'javascript', title: user.email
%p.info{ class: user.hide_email? ? 'first' : '' }
- message = "#{t 'activerecord.attributes.user.site'}: "
= message
= link_to short_message(user.site, max_length - message.length), user.site, title: user.site
%p.info{title: user.company}= short_message("#{t 'activerecord.attributes.user.company'}: #{user.company}", max_length)
%p.info{title: user.location}= short_message("#{t 'activerecord.attributes.user.location'}: #{user.location}", max_length)
.span6
%h3{style: 'margin-top: 0;'}= desc_title
= desc
%hr.profile_line{color: 'dfe8ef', size: '3'}
.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 #{!@hidden ? 'active' : ''}"
%li= link_to t('layout.projects.private'), '#', class: "private-projects #{@hidden ? 'active' : ''}"
.search
.pic
.field= text_field_tag :query_projects, @query, placeholder: t('layout.find_project')
.both
.profile-table= render 'shared/profile_projects', projects: projects

17
app/views/shared/_profile_projects.html.haml
View File

@ -1,17 +0,0 @@
- pr_groups = projects.in_groups(2)
%table
%tbody
- 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 short_message(project.name, 60), project, title: project.name
.both
.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)}"
%br
%div{style: 'margin: 10px;'}= will_paginate projects

10
app/views/statistics/_build_lists.html.slim
View File

@ -6,7 +6,7 @@
.row
.col-md-8
.graph-wrapper
h4
b
span.graph-key-color1>
= t('.build_started_title')
span.graph-key-color2>
@ -23,7 +23,7 @@
.col-md-3
.panel-wrapper
h4
b
= t('.total_build_started')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'
@ -32,7 +32,7 @@
| {{ statistics.build_lists.build_started_count | number }}
.panel-wrapper
h4
b
= t('.total_success')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'
@ -41,7 +41,7 @@
| {{ statistics.build_lists.success_count | number }}
.panel-wrapper
h4
b
= t('.total_build_error')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'
@ -50,7 +50,7 @@
| {{ statistics.build_lists.build_error_count | number }}
.panel-wrapper
h4
b
= t('.total_build_published')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'

4
app/views/statistics/_commits.html.slim
View File

@ -6,7 +6,7 @@
.row
.col-md-8
.graph-wrapper
h4
b
span.graph-key-color1>
= t('.commits_title')
.text-center.graph-loading ng-show='loading'
@ -17,7 +17,7 @@
.col-md-3
.panel-wrapper
h4
b
= t('.total_commits')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'

5
app/views/statistics/_filter.html.slim
View File

@ -1,3 +1,4 @@
- user ||= false
.row
.col-md-12
@ -55,6 +56,10 @@
i.glyphicon.glyphicon-calendar
| &nbsp;
- if user
.form-group ng-init="users_or_groups = '#{user.uname}'"
- else
.form-group>
label.control-label>
= t('.users_or_groups_label')

8
app/views/statistics/_issues.html.slim
View File

@ -6,7 +6,7 @@
.row
.col-md-8
.graph-wrapper
h4
b
span.graph-key-color1>
= t('.open_title')
span.graph-key-color2>
@ -21,7 +21,7 @@
.col-md-3
.panel-wrapper
h4
b
= t('.total_open')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'
@ -30,7 +30,7 @@
| {{ statistics.issues.open_count | number }}
.panel-wrapper
h4
b
= t('.total_reopen')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'
@ -39,7 +39,7 @@
| {{ statistics.issues.reopen_count | number }}
.panel-wrapper
h4
b
= t('.total_closed')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'

8
app/views/statistics/_pull_requests.html.slim
View File

@ -6,7 +6,7 @@
.row
.col-md-8
.graph-wrapper
h4
b
span.graph-key-color1>
= t('.open_title')
span.graph-key-color2>
@ -21,7 +21,7 @@
.col-md-3
.panel-wrapper
h4
b
= t('.total_open')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'
@ -30,7 +30,7 @@
| {{ statistics.pull_requests.open_count | number }}
.panel-wrapper
h4
b
= t('.total_merged')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'
@ -39,7 +39,7 @@
| {{ statistics.pull_requests.merged_count | number }}
.panel-wrapper
h4
b
= t('.total_closed')
.panel-data
= image_tag 'loading-small.gif', ng_show: 'loading'

2
app/views/users/base/_submenu.html.slim
View File

@ -11,7 +11,7 @@
span.icon-bar
span.icon-bar
.navbar-brand
= link_to current_user.uname, current_user
= link_to @user.uname, @user
/ Collect the nav links, forms, and other content for toggling
#submenu-navbar-collapse.collapse.navbar-collapse
ul.nav.navbar-nav.left-border

38
app/views/users/profile/_projects.html.slim Normal file
View File

@ -0,0 +1,38 @@
= simple_form_for :project, html: { 'ng-submit' => 'search()', id: 'search_projects_form' } do |f|
= hidden_field_tag 'subject_uname', @user.uname
.row
- if current_user
.col-md-3
= f.input :visibility,
label: false,
collection: project_visibility_options,
include_blank: false,
input_html: { ng_model: 'visibility' }
.col-md-4
= f.input :name,
label: false,
input_html: { ng_model: 'term' }
.col-md-5
=> f.button :submit, t('layout.search.header')
=> t('layout.or')
a href=user_path(@user)
= t('layout.clear')
hr
table.table.table-striped ng-show='!processing'
thead
tr
th
tbody
tr ng-repeat='project in projects'
td
h4
a ng-href='{{project.path}}'
| {{project.name}}
p
| {{project.description}}
= angularjs_paginate

5
app/views/users/profile/_statistics.html.slim Normal file
View File

@ -0,0 +1,5 @@
= render 'statistics/filter', user: @user
= render 'statistics/build_lists'
= render 'statistics/commits'
= render 'statistics/issues'
= render 'statistics/pull_requests'

10
app/views/users/profile/show.html.haml
View File

@ -1,10 +0,0 @@
-set_meta_tags title: title_object(@user)
- edit_url = can?(:edit, @user) ? (current_user == @user ? profile_settings_path : edit_admin_user_path(@user)) : nil
= render 'shared/profile', uname: @user.uname,
name: @user.name,
user: @user,
search_path: user_path,
projects: @projects,
edit_url: edit_url

61
app/views/users/profile/show.html.slim Normal file
View File

@ -0,0 +1,61 @@
- set_meta_tags title: title_object(@user)
= render 'users/base/submenu'
.row
.col-md-3.col-md-offset-1
- size = User::AVATAR_SIZES[:big]
= image_tag avatar_url(@user, :big),
alt: @user.uname, height: size, width: size
- if @user.name.present?
h2= @user.name.truncate(20)
h3.help-block= @user.uname.truncate(20)
hr
- if @user.professional_experience.present?
b= t('activerecord.attributes.user.professional_experience')
p= @user.professional_experience
- unless @user.hide_email?
b= t('activerecord.attributes.user.email')
p= mail_to @user.email, @user.email.truncate(50), title: @user.email
- if @user.site.present?
b= t('activerecord.attributes.user.site')
p= link_to @user.site.truncate(50), @user.site
- if @user.company.present?
b= t('activerecord.attributes.user.company')
p= @user.company.truncate(50)
- if @user.location.present?
b= t('activerecord.attributes.user.location')
p= @user.location.truncate(50)
hr
h4= t('top_menu.groups')
- size = User::AVATAR_SIZES[:micro]
- @groups.each do |group|
p
=> image_tag avatar_url(group, :micro), alt: group.uname, height: size, width: size
= link_to group.uname.truncate(20), group
.col-md-7
ul.nav.nav-tabs ng-init="tab = 'projects'"
li[ role='presentation'
ng-class="{ active: tab == 'projects' }"
ng-click="tab = 'projects'" ]
a href="#"
= t('top_menu.projects')
li[ role='presentation'
ng-class="{ active: tab == 'statistics' }"
ng-click="tab = 'statistics'" ]
a href="#"
= t('top_menu.statistics')
.offset20 ng-show="tab == 'projects'" ng-controller='ProfileController'
= render 'projects'
#manage-statistics.offset20 ng-show="tab == 'statistics'" ng-controller='StatisticsController' ng-init='init()'
= render 'statistics'

6
app/views/users/profile/show.json.jbuilder Normal file
View File

@ -0,0 +1,6 @@
json.projects @projects do |project|
json.(project, :name, :description)
json.path project_path(project)
end
json.total_items @total_items