From 3f91da6816150f1e3b9c7747c7402b543f1d681a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Sat, 18 Feb 2012 15:59:01 +0200 Subject: [PATCH] Fixed widget counts, improved styles --- app/assets/stylesheets/common.scss | 5 +++++ app/views/deploy_keys/_show.html.haml | 19 ++++++++++++------- app/views/deploy_keys/index.html.haml | 4 ++-- app/views/deploy_keys/new.html.haml | 3 ++- app/views/hooks/index.html.haml | 14 +++++++++----- app/views/hooks/new.html.haml | 11 +++++------ app/views/keys/_show.html.haml | 21 +++++++++++++-------- app/views/keys/index.html.haml | 7 +++---- app/views/profile/password.html.haml | 5 +++-- app/views/projects/_form.html.haml | 2 +- app/views/projects/files.html.haml | 21 +++++++++++---------- app/views/repositories/_feed.html.haml | 18 ++++++++++-------- app/views/repositories/branches.html.haml | 2 +- app/views/repositories/show.html.haml | 11 +++++------ app/views/repositories/tags.html.haml | 18 ++++++++++-------- app/views/snippets/_snippet.html.haml | 9 ++++----- app/views/snippets/index.html.haml | 2 +- app/views/team_members/show.html.haml | 4 ++-- app/views/widgets/_project_member.html.haml | 6 +++--- 19 files changed, 102 insertions(+), 80 deletions(-) diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 09d9d62d4ef..8657635982f 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -268,6 +268,7 @@ img.lil_av { .ui-box { + margin-bottom: 40px; @include round-borders-all(4px); border-color:#ddd; @@ -322,3 +323,7 @@ img.lil_av { width:20px; } } + +.borders { + border: 1px solid #ccc; +} diff --git a/app/views/deploy_keys/_show.html.haml b/app/views/deploy_keys/_show.html.haml index b1622f35167..919b2d0ce0c 100644 --- a/app/views/deploy_keys/_show.html.haml +++ b/app/views/deploy_keys/_show.html.haml @@ -1,7 +1,12 @@ -%a.update-item{:href => project_deploy_key_path(key.project, key)} - %span.update-title - = key.title - %span.update-author - Added - = time_ago_in_words(key.created_at) - ago +%tr + %td + %a{:href => project_deploy_key_path(key.project, key)} + = key.title + %td + %span.update-author + Added + = time_ago_in_words(key.created_at) + ago + %td + = link_to 'Remove', project_deploy_key_path(key.project, key), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn delete-key small" + diff --git a/app/views/deploy_keys/index.html.haml b/app/views/deploy_keys/index.html.haml index f0162f5168a..b03e7539806 100644 --- a/app/views/deploy_keys/index.html.haml +++ b/app/views/deploy_keys/index.html.haml @@ -5,6 +5,6 @@ = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do Add Deploy Key -%ul.unstyled +%table.zebra-striped.borders - @keys.each do |key| - %li= render(:partial => 'show', :locals => {:key => key}) + = render(:partial => 'show', :locals => {:key => key}) diff --git a/app/views/deploy_keys/new.html.haml b/app/views/deploy_keys/new.html.haml index 1e6b7e77144..a2f1010b454 100644 --- a/app/views/deploy_keys/new.html.haml +++ b/app/views/deploy_keys/new.html.haml @@ -1,5 +1,6 @@ = render "repositories/head" -%h2 New Deploy key +%h3 New Deploy key +%hr = render 'form' diff --git a/app/views/hooks/index.html.haml b/app/views/hooks/index.html.haml index 09391898afd..9ec8c556b28 100644 --- a/app/views/hooks/index.html.haml +++ b/app/views/hooks/index.html.haml @@ -6,13 +6,17 @@ = link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do Add Post Receive Hook -%ul.unstyled +%table.zebra-striped.borders - @hooks.each do |hook| - %li.wll - = link_to project_hook_path(@project, hook) do - = hook.url + %tr + %td + = link_to project_hook_path(@project, hook) do + = hook.url + %td + = link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small" -.alert-message.block-message.info + +.alert-message.block-message We send some data with POST request when someone makes git push .well= render "data_ex" diff --git a/app/views/hooks/new.html.haml b/app/views/hooks/new.html.haml index 8078aefa503..f2a5ef534f4 100644 --- a/app/views/hooks/new.html.haml +++ b/app/views/hooks/new.html.haml @@ -4,10 +4,9 @@ %ul - @hook.errors.full_messages.each do |msg| %li= msg - = f.label :url, "URL:" - = f.text_field :url, :class => "text_field" - .clear - %br - .merge-tabs - = f.submit "Save", :class => "grey-button" + .clearfix + = f.label :url, "URL:" + .input= f.text_field :url, :class => "text_field" + .actions + = f.submit "Save", :class => "btn" diff --git a/app/views/keys/_show.html.haml b/app/views/keys/_show.html.haml index 132511b2dd9..1df9b91dffa 100644 --- a/app/views/keys/_show.html.haml +++ b/app/views/keys/_show.html.haml @@ -1,8 +1,13 @@ -%li.wll - = link_to key_path(key) do - %p - %strong= key.title - %span.right.cgray - Added - = time_ago_in_words(key.created_at) - ago +%tr + %td + = link_to key_path(key) do + %p + %strong= key.title + %td + %span.right.cgray + Added + = time_ago_in_words(key.created_at) + ago + %td + = link_to 'Remove', key, :confirm => 'Are you sure?', :method => :delete, :class => "btn small danger delete-key right" + diff --git a/app/views/keys/index.html.haml b/app/views/keys/index.html.haml index 002089a00ec..59ce7846b28 100644 --- a/app/views/keys/index.html.haml +++ b/app/views/keys/index.html.haml @@ -4,7 +4,6 @@ %hr -%div#keys-table - %ul.unstyled - - @keys.each do |key| - = render(:partial => 'show', :locals => {:key => key}) +%table#keys-table.zebra-striped.borders + - @keys.each do |key| + = render(:partial => 'show', :locals => {:key => key}) diff --git a/app/views/profile/password.html.haml b/app/views/profile/password.html.haml index 3a88b1ce439..dc1f221435e 100644 --- a/app/views/profile/password.html.haml +++ b/app/views/profile/password.html.haml @@ -2,9 +2,10 @@ %hr = form_for @user, :url => profile_password_path, :method => :put do |f| .data - %p After successfull password update you will be redirected to login page where you should login with new password + .alert-message.block-message.warning + %p After successfull password update you will be redirected to login page where you should login with new password -if @user.errors.any? - #error_explanation + .alert-message.block-message.error %ul - @user.errors.full_messages.each do |msg| %li= msg diff --git a/app/views/projects/_form.html.haml b/app/views/projects/_form.html.haml index 01c1cac1793..167a7d008d9 100644 --- a/app/views/projects/_form.html.haml +++ b/app/views/projects/_form.html.haml @@ -27,7 +27,7 @@ = f.label :default_branch, "Default Branch" .input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;") - .well + .alert-message.block-message.warning %h5 Features .clearfix diff --git a/app/views/projects/files.html.haml b/app/views/projects/files.html.haml index 8ea4ac8a130..48ceece772c 100644 --- a/app/views/projects/files.html.haml +++ b/app/views/projects/files.html.haml @@ -1,16 +1,17 @@ = render "project_head" - unless @notes.empty? - %div.update-data.ui-box.ui-box-small - .data - - @notes.each do |note| - %a.update-item{:href => note.attachment.url} - = image_tag gravatar_icon(note.author_email), :class => "left", :width => 16 - %span.update-title{:style => "margin-bottom:0px;"} + %table.zebra-striped.borders + - @notes.each do |note| + %tr + %td + %a{:href => note.attachment.url} + = image_tag gravatar_icon(note.author_email), :class => "left", :width => 16 +   = note.attachment_identifier - %span.update-author.right - Added - = time_ago_in_words(note.created_at) - ago + %td + Added + = time_ago_in_words(note.created_at) + ago - else .notice_holder %li All files attached to project wall, issues etc will be displayed here diff --git a/app/views/repositories/_feed.html.haml b/app/views/repositories/_feed.html.haml index be88d59bd80..d66f51e4ba4 100644 --- a/app/views/repositories/_feed.html.haml +++ b/app/views/repositories/_feed.html.haml @@ -1,13 +1,15 @@ - commit = update -.wll - = link_to project_commits_path(@project, :ref => commit.head.name) do - %p - %strong.label +%tr + %td + = link_to project_commits_path(@project, :ref => commit.head.name) do + %strong = commit.head.name - %br + %td + %div %code= commit.id.to_s[0..10] = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16 = truncate(commit.safe_message, :length => 40) - %span.right.cgray - = time_ago_in_words(commit.committed_date) - ago + %td + %span.right.cgray + = time_ago_in_words(commit.committed_date) + ago diff --git a/app/views/repositories/branches.html.haml b/app/views/repositories/branches.html.haml index 91a97207791..23e3eac3b35 100644 --- a/app/views/repositories/branches.html.haml +++ b/app/views/repositories/branches.html.haml @@ -1,6 +1,6 @@ = render "repositories/branches_head" - unless @branches.empty? - %table + %table.zebra-striped.borders %thead %tr %th Name diff --git a/app/views/repositories/show.html.haml b/app/views/repositories/show.html.haml index e73db6f053f..c72b866b950 100644 --- a/app/views/repositories/show.html.haml +++ b/app/views/repositories/show.html.haml @@ -24,11 +24,10 @@ -.ui-box - %h5.cgray - Recent Branches +%h5.cgray + Recently updated branches - %ul.unstyled - - @activities.each do |update| - = render "repositories/feed", :update => update, :project => @project +%table.zebra-striped.borders + - @activities.each do |update| + = render "repositories/feed", :update => update, :project => @project diff --git a/app/views/repositories/tags.html.haml b/app/views/repositories/tags.html.haml index 4c90bae2a3b..229362bc1ca 100644 --- a/app/views/repositories/tags.html.haml +++ b/app/views/repositories/tags.html.haml @@ -1,17 +1,19 @@ = render "head" - unless @tags.empty? - %ul.unstyled + %table.zebra-striped.borders - @tags.each do |tag| - %li.wll - .span3.right + %tr + %td + = tag.name + %code= tag.commit.id.to_s[0..10] + %span.update-author.right + = time_ago_in_words(tag.commit.committed_date) + ago +   + %td - if can? current_user, :download_code, @project = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small" = link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small" - = tag.name - %code= tag.commit.id.to_s[0..10] - %span.update-author.right - = time_ago_in_words(tag.commit.committed_date) - ago - else %h3 No tags diff --git a/app/views/snippets/_snippet.html.haml b/app/views/snippets/_snippet.html.haml index 08acc9b6f41..d6002362a15 100644 --- a/app/views/snippets/_snippet.html.haml +++ b/app/views/snippets/_snippet.html.haml @@ -1,7 +1,6 @@ -%li.entry - %a{:href => project_snippet_path(snippet.project, snippet)} - %p - %strong - = truncate(snippet.title, :length => 60) +%tr + %td + %a{:href => project_snippet_path(snippet.project, snippet)} + = truncate(snippet.title, :length => 60) %span.right.cgray = snippet.file_name diff --git a/app/views/snippets/index.html.haml b/app/views/snippets/index.html.haml index b5658828c91..762265f16b3 100644 --- a/app/views/snippets/index.html.haml +++ b/app/views/snippets/index.html.haml @@ -9,4 +9,4 @@ To add new snippet - click on button. - unless @snippets.fresh.empty? - %ul.unstyled= render @snippets.fresh + %table.zebra-striped.borders= render @snippets.fresh diff --git a/app/views/team_members/show.html.haml b/app/views/team_members/show.html.haml index fcf2db9ba84..d05ef740fb9 100644 --- a/app/views/team_members/show.html.haml +++ b/app/views/team_members/show.html.haml @@ -12,8 +12,8 @@ = link_to team_project_path(@project), :class => "" do ← To team list -%hr -%table.no-borders +%br +%table.zebra-striped.borders %tr %td Name %td= user.name diff --git a/app/views/widgets/_project_member.html.haml b/app/views/widgets/_project_member.html.haml index 911af9517ef..cbe8ce54037 100644 --- a/app/views/widgets/_project_member.html.haml +++ b/app/views/widgets/_project_member.html.haml @@ -11,14 +11,14 @@ %p - if @project.issues_enabled Assigned issues: - = current_user.assigned_issues.count + = current_user.assigned_issues.opened.count %br - if @project.merge_requests_enabled Assigned merge request: - = current_user.assigned_merge_requests.count + = current_user.assigned_merge_requests.opened.count %br Your merge requests: - = current_user.assigned_merge_requests.count + = current_user.assigned_merge_requests.opened.count .link_holder = link_to project_team_member_path(@project, member), :title => current_user.name do = "Access: #{member.project_access_human} ยป"