Commit 9803e088 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Project sidebar improved

parent 1c22d4f5
...@@ -52,7 +52,7 @@ class Admin::ProjectsController < ApplicationController ...@@ -52,7 +52,7 @@ class Admin::ProjectsController < ApplicationController
def update def update
@admin_project = Project.find_by_code(params[:id]) @admin_project = Project.find_by_code(params[:id])
owner_id = params[:project][:owner_id] owner_id = params[:project].delete(:owner_id)
if owner_id if owner_id
@admin_project.owner = User.find(owner_id) @admin_project.owner = User.find(owner_id)
......
...@@ -14,9 +14,9 @@ ...@@ -14,9 +14,9 @@
= text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url" = text_field_tag :project_clone, @project.url_to_repo, :class => "xlarge one_click_select git_clone_url"
= simple_format @project.description = simple_format @project.description
- unless @activities.blank?
.ui-box .ui-box
%h5.cgray Recent Activity %h5.cgray Recent Activity
.content_list= render "feed" .content_list= render "feed"
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
= link_to project_team_member_path(@project, member), :title => current_user.name do = link_to project_team_member_path(@project, member), :title => current_user.name do
= image_tag gravatar_icon(current_user.email, 60), :class => "thumbnail", :width => 60 = image_tag gravatar_icon(current_user.email, 60), :class => "thumbnail", :width => 60
%h4 %h4
Hi, Hey,
= truncate current_user.first_name, :lenght => 24 #{truncate current_user.first_name, :lenght => 24}!
!
%p %p
- if @project.issues_enabled - if @project.issues_enabled
Assigned issues: Assigned issues:
...@@ -19,9 +19,25 @@ ...@@ -19,9 +19,25 @@
%br %br
Your merge requests: Your merge requests:
= current_user.assigned_merge_requests.opened.count = current_user.assigned_merge_requests.opened.count
%br
%br
- if @project.merge_requests_enabled
= link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small" do
Merge Request
- if @project.issues_enabled
= link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
Issue
%hr
%p
Your access level in this project is
%code #{member.project_access_human}
%br
Visit member card for more information
.link_holder .link_holder
= link_to project_team_member_path(@project, member), :title => current_user.name do = link_to project_team_member_path(@project, member), :title => current_user.name do
= "Access: #{member.project_access_human} »" = "Member Card »"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment