diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-11 01:41:05 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-03-11 01:41:05 +0400 |
commit | a10ad7183e0edd04646b778954de610cf69bbff8 (patch) | |
tree | 1d721f6bbdfe7ef8b4dfb6814f12c6c4c500a3b8 /app | |
parent | bd7359b50e0afac245aa5c15ab633f35a7fbfba3 (diff) |
Usability improved. Nothing to show messages for issues, MR
Diffstat (limited to 'app')
-rw-r--r-- | app/views/issues/index.html.haml | 6 | ||||
-rw-r--r-- | app/views/keys/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/keys/show.html.haml | 11 | ||||
-rw-r--r-- | app/views/merge_requests/index.html.haml | 7 | ||||
-rw-r--r-- | app/views/profile/show.html.haml | 9 |
5 files changed, 30 insertions, 5 deletions
diff --git a/app/views/issues/index.html.haml b/app/views/issues/index.html.haml index 297eab259be..e55cae1fa94 100644 --- a/app/views/issues/index.html.haml +++ b/app/views/issues/index.html.haml @@ -33,7 +33,11 @@ = hidden_field_tag :status, params[:f] = search_field_tag :issue_search, nil, { :placeholder => 'Search', :class => 'issue_search' } - %ul#issues-table.unstyled= render "issues" + %ul#issues-table.unstyled + = render "issues" + - if @issues.blank? + %li + %p.padded Nothing to show here :javascript var href = $('.issue_search').parent().attr('action'); diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml index 59ce7846b28..9431a0a53de 100644 --- a/app/views/keys/index.html.haml +++ b/app/views/keys/index.html.haml @@ -2,7 +2,7 @@ SSH Keys = link_to "Add new", new_key_path, :class => "btn small right" -%hr +%br %table#keys-table.zebra-striped.borders - @keys.each do |key| diff --git a/app/views/keys/show.html.haml b/app/views/keys/show.html.haml index fe7f80d591f..540c98c0675 100644 --- a/app/views/keys/show.html.haml +++ b/app/views/keys/show.html.haml @@ -1,5 +1,14 @@ -%h3= @key.title +%h3 + Public key: + = @key.title + %small + created at + = @key.created_at.stamp("Aug 21, 2011") +.back_link + = link_to keys_path do + ← To keys list %hr + %pre= @key.key .actions = link_to 'Remove', @key, :confirm => 'Are you sure?', :method => :delete, :class => "btn danger delete-key" diff --git a/app/views/merge_requests/index.html.haml b/app/views/merge_requests/index.html.haml index 9ced7a86938..468eaf33179 100644 --- a/app/views/merge_requests/index.html.haml +++ b/app/views/merge_requests/index.html.haml @@ -22,5 +22,10 @@ = link_to project_merge_requests_path(@project, :f => 1) do All - %ul.unstyled= render @merge_requests + %ul.unstyled + = render @merge_requests + - if @merge_requests.blank? + %li + %p.padded Nothing to show here + diff --git a/app/views/profile/show.html.haml b/app/views/profile/show.html.haml index 2c2249bf0d2..ab491657511 100644 --- a/app/views/profile/show.html.haml +++ b/app/views/profile/show.html.haml @@ -1,7 +1,14 @@ .media-grid = link_to "#" do = image_tag gravatar_icon(@user.email, 90), :class => "thumbnail" - %h3.media_h= @user.name + %h3.media_h + = @user.name + %br + %small + = @user.email + + .right + %p.alert-message.block-message You can change your avatar at gravatar.com %hr |