From a10ad7183e0edd04646b778954de610cf69bbff8 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 10 Mar 2012 23:41:05 +0200 Subject: [PATCH] Usability improved. Nothing to show messages for issues, MR --- app/views/issues/index.html.haml | 6 +++++- app/views/keys/index.html.haml | 2 +- app/views/keys/show.html.haml | 11 ++++++++++- app/views/merge_requests/index.html.haml | 7 ++++++- 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 297eab259..e55cae1fa 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 59ce7846b..9431a0a53 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 fe7f80d59..540c98c06 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 9ced7a869..468eaf331 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 2c2249bf0..ab4916575 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 -- 2.11.0