Usability & design improvements

This commit is contained in:
Dmitriy Zaporozhets 2012-02-18 14:12:48 +02:00
parent 9a24ccdea1
commit 94db8a1c33
21 changed files with 190 additions and 89 deletions

View file

@ -1,7 +1,7 @@
%li.wll
= image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
%span.update-author
%strong= link_to_merge_request_author(merge_request)
%strong= merge_request.author_name
authored
= time_ago_in_words(merge_request.created_at)
ago

View file

@ -6,14 +6,21 @@
%hr
%ul.pills
%li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
= link_to project_merge_requests_path(@project, :f => 0) do
Open
%li{:class => ("active" if params[:f] == "2")}
= link_to project_merge_requests_path(@project, :f => 2) do
Closed
.ui-box
.title
%ul.pills
%li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
= link_to project_merge_requests_path(@project, :f => 0) do
Open
%li{:class => ("active" if params[:f] == "2")}
= link_to project_merge_requests_path(@project, :f => 2) do
Closed
%li{:class => ("active" if params[:f] == "3")}
= link_to project_merge_requests_path(@project, :f => 3) do
To Me
%li{:class => ("active" if params[:f] == "1")}
= link_to project_merge_requests_path(@project, :f => 1) do
All
%hr
%ul.unstyled= render @merge_requests
%ul.unstyled= render @merge_requests

View file

@ -19,6 +19,9 @@
= link_to edit_project_merge_request_path(@project, @merge_request), :class => "btn small" do
Edit
.back_link
= link_to project_merge_requests_path(@project) do
← To merge requests
%hr
- if @merge_request.closed
.alert-message.error Closed