diff options
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_groups.html.haml | 4 | ||||
| -rw-r--r-- | app/views/users/_profile.html.haml | 31 | ||||
| -rw-r--r-- | app/views/users/_projects.html.haml | 13 | ||||
| -rw-r--r-- | app/views/users/calendar.html.haml | 12 | ||||
| -rw-r--r-- | app/views/users/calendar_activities.html.haml | 23 | ||||
| -rw-r--r-- | app/views/users/show.atom.builder | 12 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 50 |
7 files changed, 0 insertions, 145 deletions
diff --git a/app/views/users/_groups.html.haml b/app/views/users/_groups.html.haml deleted file mode 100644 index f360fbb3d5d..00000000000 --- a/app/views/users/_groups.html.haml +++ /dev/null @@ -1,4 +0,0 @@ -.clearfix - - groups.each do |group| - = link_to group, class: 'profile-groups-avatars inline', title: group.name do - = image_tag group_icon(group), class: 'avatar group-avatar s40' diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml deleted file mode 100644 index 90d9980c85c..00000000000 --- a/app/views/users/_profile.html.haml +++ /dev/null @@ -1,31 +0,0 @@ -.panel.panel-default - .panel-heading - Profile - %ul.well-list - %li - %span.light Member since - %strong= user.created_at.stamp("Aug 21, 2011") - - unless user.public_email.blank? - %li - %span.light E-mail: - %strong= link_to user.public_email, "mailto:#{user.public_email}" - - unless user.skype.blank? - %li - %span.light Skype: - %strong= link_to user.skype, "skype:#{user.skype}" - - unless user.linkedin.blank? - %li - %span.light LinkedIn: - %strong= link_to user.linkedin, "http://www.linkedin.com/in/#{user.linkedin}" - - unless user.twitter.blank? - %li - %span.light Twitter: - %strong= link_to user.twitter, "http://www.twitter.com/#{user.twitter}" - - unless user.website_url.blank? - %li - %span.light Website: - %strong= link_to user.short_website_url, user.full_website_url - - unless user.location.blank? - %li - %span.light Location: - %strong= user.location diff --git a/app/views/users/_projects.html.haml b/app/views/users/_projects.html.haml deleted file mode 100644 index 297fa537394..00000000000 --- a/app/views/users/_projects.html.haml +++ /dev/null @@ -1,13 +0,0 @@ -- if local_assigns.has_key?(:contributed_projects) && contributed_projects.present? - .panel.panel-default.contributed-projects - .panel-heading Projects contributed to - = render 'shared/projects_list', - projects: contributed_projects.sort_by(&:star_count).reverse, - projects_limit: 5, stars: true, avatar: false - -- if local_assigns.has_key?(:projects) && projects.present? - .panel.panel-default - .panel-heading Personal projects - = render 'shared/projects_list', - projects: projects.sort_by(&:star_count).reverse, - projects_limit: 10, stars: true, avatar: false diff --git a/app/views/users/calendar.html.haml b/app/views/users/calendar.html.haml deleted file mode 100644 index 922b0c6cebf..00000000000 --- a/app/views/users/calendar.html.haml +++ /dev/null @@ -1,12 +0,0 @@ -%h4 - Contributions calendar - .pull-right - %small Issues, merge requests and push events -#cal-heatmap.calendar - :javascript - new Calendar( - #{@timestamps.to_json}, - #{@starting_year}, - #{@starting_month}, - '#{user_calendar_activities_path}' - ); diff --git a/app/views/users/calendar_activities.html.haml b/app/views/users/calendar_activities.html.haml deleted file mode 100644 index 027a93a75fc..00000000000 --- a/app/views/users/calendar_activities.html.haml +++ /dev/null @@ -1,23 +0,0 @@ -%h4.prepend-top-20 - %span.light Contributions for - %strong #{@calendar_date.to_s(:short)} - -%ul.bordered-list - - @events.sort_by(&:created_at).each do |event| - %li - %span.light - %i.fa.fa-clock-o - = event.created_at.to_s(:time) - - if event.push? - #{event.action_name} #{event.ref_type} #{event.ref_name} - - else - = event_action_name(event) - - if event.target - %strong= link_to "##{event.target_iid}", [event.project.namespace.becomes(Namespace), event.project, event.target] - - at - %strong - - if event.project - = link_to_project event.project - - else - = event.project_name diff --git a/app/views/users/show.atom.builder b/app/views/users/show.atom.builder deleted file mode 100644 index 8fe30b23635..00000000000 --- a/app/views/users/show.atom.builder +++ /dev/null @@ -1,12 +0,0 @@ -xml.instruct! -xml.feed "xmlns" => "http://www.w3.org/2005/Atom", "xmlns:media" => "http://search.yahoo.com/mrss/" do - xml.title "Activity feed for #{@user.name}" - xml.link href: user_url(@user, :atom), rel: "self", type: "application/atom+xml" - xml.link href: user_url(@user), rel: "alternate", type: "text/html" - xml.id projects_url - xml.updated @events.maximum(:updated_at).strftime("%Y-%m-%dT%H:%M:%SZ") if @events.any? - - @events.each do |event| - event_to_atom(xml, event) - end -end diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml deleted file mode 100644 index 9dd8cb0738c..00000000000 --- a/app/views/users/show.html.haml +++ /dev/null @@ -1,50 +0,0 @@ -.row - = link_to '#aside', class: 'show-aside' do - %i.fa.fa-angle-left - %section.col-md-8 - .header-with-avatar - = image_tag avatar_icon(@user.email, 90), class: "avatar avatar-tile s90", alt: '' - %h3 - = @user.name - - if @user == current_user - .pull-right - = link_to profile_path, class: 'btn btn-sm' do - %i.fa.fa-pencil-square-o - Edit Profile settings - .username - @#{@user.username} - .description - - if @user.bio.present? - = @user.bio - - .clearfix - - - if @groups.any? - .prepend-top-20 - %h4 Groups - = render 'groups', groups: @groups - %hr - - .hidden-xs - .user-calendar - %h4.center.light - %i.fa.fa-spinner.fa-spin - .user-calendar-activities - %hr - %h4 - User Activity - - - if current_user - %span.rss-icon.pull-right - = link_to user_path(@user, :atom, { private_token: current_user.private_token }) do - %strong - %i.fa.fa-rss - - .content_list - = spinner - %aside.col-md-4 - = render 'profile', user: @user - = render 'projects', projects: @projects, contributed_projects: @contributed_projects - -:coffeescript - $(".user-calendar").load("#{user_calendar_path}") |