deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

feed few fixes

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2012-04-11 23:50:13 +03:00
parent 740e54c3fc
commit 088860de4e
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/stylesheets/common.scss
View file

@ -881,6 +881,14 @@ li.note {
.remember_me { .remember_me {
text-align:left; text-align:left;
input {
margin:0;
}
span {
padding-left:5px;
}
} }

2
app/views/dashboard/_issues_feed.html.haml
View file

@ -3,7 +3,7 @@
= link_to [issue.project, issue] do = link_to [issue.project, issue] do
%p %p
%strong %strong
%span.pretty_label= issue.project.name %span= issue.project.name
– –
Issue # Issue #
= issue.id = issue.id

2
app/views/dashboard/_merge_requests_feed.html.haml
View file

@ -3,7 +3,7 @@
= link_to [merge_request.project, merge_request] do = link_to [merge_request.project, merge_request] do
%p %p
%strong %strong
%span.pretty_label= merge_request.project.name %strong= merge_request.project.name
– –
Merge Request ##{merge_request.id} Merge Request ##{merge_request.id}
= truncate merge_request.title, :length => 50 = truncate merge_request.title, :length => 50

1
app/views/dashboard/_projects_feed.html.haml
View file

@ -4,6 +4,7 @@
= link_to project, :class => "project_link" do = link_to project, :class => "project_link" do
%span.ico.project %span.ico.project
= truncate project.name, :length => 24 = truncate project.name, :length => 24
 
%small %small
last activity at last activity at
= project.last_activity_date.stamp("Aug 25, 2011") = project.last_activity_date.stamp("Aug 25, 2011")

8
app/views/projects/team.html.haml
View file

@ -4,10 +4,10 @@
.alert.alert-info .alert.alert-info
= link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do = link_to new_project_team_member_path(@project), :class => "btn small right", :title => "New Team Member" do
New Team Member New Team Member
%p Read more about project permissions
Read more about project permissions %strong= link_to "here", help_permissions_path, :class => "vlink"
%strong= link_to "here", help_permissions_path, :class => "vlink" %br
%p To open team member profile - click on avatar. To open team member profile - click on avatar.
= render :partial => "team", :locals => {:project => @project} = render :partial => "team", :locals => {:project => @project}