Commit e64a1749 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

project membership widget. css fixes

parent 036214cbb1fd
......@@ -36,3 +36,7 @@ a {
}
}
.widget {
padding:20px;
margin-bottom:20px;
}
......@@ -96,6 +96,7 @@ def wall
end
def graph
render_full_content
@days_json, @commits_json = GraphCommit.to_graph(project)
end
......
......@@ -32,6 +32,14 @@ def update_repository
c.update_project(project.path, project)
end
end
def project_access_human
Project.access_options.key(self.project_access)
end
def repo_access_human
Repository.access_options.key(self.repo_access)
end
end
# == Schema Information
#
......
......@@ -4,7 +4,7 @@
<%= f.password_field :password, :class => "text bottom", :placeholder => "Password" %>
<% if devise_mapping.rememberable? -%>
<div class="clearfix"> <%= f.label :remember_me %><%= f.check_box :remember_me %></div>
<div class="clearfix"> <%= f.label :remember_me %> &nbsp; <%= f.check_box :remember_me %></div>
<% end -%>
<br/>
<%= f.submit "Sign in", :class => "primary btn" %>
......
......@@ -4,43 +4,5 @@
- else
- if content_for? :sidebar_top_block
= yield :sidebar_top_block
- else
- if can? current_user, :write_project, @project
.alert-message.block-message.info
You have access to create new issue or merge request.
%div
= link_to new_project_issue_path(@project), :title => "New Issue", :class => "btn small" do
New Issue »
%div
= link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "btn small" do
New Merge Request »
- if current_user.projects.count > 0
%div.entry
%h5
Recent Projects:
%ul
- current_user.projects.order("id DESC").limit(5).each do |project|
%li
= link_to project_path(project) do
= project.name
= link_to "More » ", projects_path
-#%h4
-#Recent Issues:
-#%ul
-#- current_user.assigned_issues.order("id DESC").limit(5).each do |issue|
-#%li
-#= link_to project_issue_path(issue.project, issue) do
-#= truncate issue.title
-#%h4
-#Recent Requests:
-#%ul
-#- current_user.assigned_merge_requests.order("id DESC").limit(5).each do |issue|
-#%li
-#= link_to project_merge_request_path(issue.project, issue) do
-#= truncate issue.title
= render "widgets/project_member"
= render "widgets/recent_projects"
- member = @project.team_member_by_id(current_user.id)
.widget
.media-grid
%li
= link_to project_team_member_path(@project, member), :title => current_user.name do
= image_tag gravatar_icon(current_user.email, 90), :class => "thumbnail"
.row
.span4
%h4
= truncate(current_user.name, :lenght => 24)
- if @project.owner == current_user
%span.label Project Owner
.span3
%span.label= member.project_access_human
%span.label= member.repo_access_human
- if can? current_user, :write_project, @project
%hr
.span3
%p You have access to create new issue or merge request.
%div
= link_to new_project_issue_path(@project), :title => "New Issue", :class => "" do
New Issue »
%div
= link_to new_project_merge_request_path(@project), :title => "New Merge Request", :class => "" do
New Merge Request »
- if current_user.projects.count > 0
%div.widget
%h4
Recent Projects:
%ul
- current_user.projects.order("id DESC").limit(5).each do |project|
%li
= link_to project_path(project) do
= project.name
= link_to "More » ", projects_path
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