Download as
Browse Code »

Commit 3f91da6816150f1e3b9c7747c7402b543f1d681a

Authored by Dmitriy Zaporozhets
1 parent fa7bd43a
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fixed widget counts, improved styles

Showing 19 changed files with 102 additions and 80 deletions   Show diff stats
app/assets/stylesheets/common.scss
  Diff comments   View file @3f91da6
@@ -268,6 +268,7 @@ img.lil_av { @@ -268,6 +268,7 @@ img.lil_av {
268 268
269 269
270 .ui-box { 270 .ui-box {
  271 +
271 margin-bottom: 40px; 272 margin-bottom: 40px;
272 @include round-borders-all(4px); 273 @include round-borders-all(4px);
273 border-color:#ddd; 274 border-color:#ddd;
@@ -322,3 +323,7 @@ img.lil_av { @@ -322,3 +323,7 @@ img.lil_av {
322 width:20px; 323 width:20px;
323 } 324 }
324 } 325 }
  326 +
  327 +.borders {
  328 + border: 1px solid #ccc;
  329 +}
app/views/deploy_keys/_show.html.haml
  Diff comments   View file @3f91da6
1 -%a.update-item{:href => project_deploy_key_path(key.project, key)}  
2 - %span.update-title  
3 - = key.title  
4 - %span.update-author  
5 - Added  
6 - = time_ago_in_words(key.created_at)  
7 - ago 1 +%tr
  2 + %td
  3 + %a{:href => project_deploy_key_path(key.project, key)}
  4 + = key.title
  5 + %td
  6 + %span.update-author
  7 + Added
  8 + = time_ago_in_words(key.created_at)
  9 + ago
  10 + %td
  11 + = link_to 'Remove', project_deploy_key_path(key.project, key), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn delete-key small"
  12 +
app/views/deploy_keys/index.html.haml
  Diff comments   View file @3f91da6
@@ -5,6 +5,6 @@ @@ -5,6 +5,6 @@
5 = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do 5 = link_to new_project_deploy_key_path(@project), :class => "btn small", :title => "New Deploy Key" do
6 Add Deploy Key 6 Add Deploy Key
7 7
8 -%ul.unstyled 8 +%table.zebra-striped.borders
9 - @keys.each do |key| 9 - @keys.each do |key|
10 - %li= render(:partial => 'show', :locals => {:key => key}) 10 + = render(:partial => 'show', :locals => {:key => key})
app/views/deploy_keys/new.html.haml
  Diff comments   View file @3f91da6
1 = render "repositories/head" 1 = render "repositories/head"
2 2
3 -%h2 New Deploy key 3 +%h3 New Deploy key
  4 +%hr
4 5
5 = render 'form' 6 = render 'form'
app/views/hooks/index.html.haml
  Diff comments   View file @3f91da6
@@ -6,13 +6,17 @@ @@ -6,13 +6,17 @@
6 = link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do 6 = link_to new_project_hook_path(@project), :class => "btn small", :title => "New Web Hook" do
7 Add Post Receive Hook 7 Add Post Receive Hook
8 8
9 -%ul.unstyled 9 +%table.zebra-striped.borders
10 - @hooks.each do |hook| 10 - @hooks.each do |hook|
11 - %li.wll  
12 - = link_to project_hook_path(@project, hook) do  
13 - = hook.url 11 + %tr
  12 + %td
  13 + = link_to project_hook_path(@project, hook) do
  14 + = hook.url
  15 + %td
  16 + = link_to 'Remove', project_hook_path(@project, hook), :confirm => 'Are you sure?', :method => :delete, :class => "danger btn small"
14 17
15 -.alert-message.block-message.info 18 +
  19 +.alert-message.block-message
16 We send some data with POST request when someone makes git push 20 We send some data with POST request when someone makes git push
17 21
18 .well= render "data_ex" 22 .well= render "data_ex"
app/views/hooks/new.html.haml
  Diff comments   View file @3f91da6
@@ -4,10 +4,9 @@ @@ -4,10 +4,9 @@
4 %ul 4 %ul
5 - @hook.errors.full_messages.each do |msg| 5 - @hook.errors.full_messages.each do |msg|
6 %li= msg 6 %li= msg
7 - = f.label :url, "URL:"  
8 - = f.text_field :url, :class => "text_field"  
9 - .clear  
10 - %br  
11 - .merge-tabs  
12 - = f.submit "Save", :class => "grey-button" 7 + .clearfix
  8 + = f.label :url, "URL:"
  9 + .input= f.text_field :url, :class => "text_field"
  10 + .actions
  11 + = f.submit "Save", :class => "btn"
13 12
app/views/keys/_show.html.haml
  Diff comments   View file @3f91da6
1 -%li.wll  
2 - = link_to key_path(key) do  
3 - %p  
4 - %strong= key.title  
5 - %span.right.cgray  
6 - Added  
7 - = time_ago_in_words(key.created_at)  
8 - ago 1 +%tr
  2 + %td
  3 + = link_to key_path(key) do
  4 + %p
  5 + %strong= key.title
  6 + %td
  7 + %span.right.cgray
  8 + Added
  9 + = time_ago_in_words(key.created_at)
  10 + ago
  11 + %td
  12 + = link_to 'Remove', key, :confirm => 'Are you sure?', :method => :delete, :class => "btn small danger delete-key right"
  13 +
app/views/keys/index.html.haml
  Diff comments   View file @3f91da6
@@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
4 4
5 %hr 5 %hr
6 6
7 -%div#keys-table  
8 - %ul.unstyled  
9 - - @keys.each do |key|  
10 - = render(:partial => 'show', :locals => {:key => key}) 7 +%table#keys-table.zebra-striped.borders
  8 + - @keys.each do |key|
  9 + = render(:partial => 'show', :locals => {:key => key})
app/views/profile/password.html.haml
  Diff comments   View file @3f91da6
@@ -2,9 +2,10 @@ @@ -2,9 +2,10 @@
2 %hr 2 %hr
3 = form_for @user, :url => profile_password_path, :method => :put do |f| 3 = form_for @user, :url => profile_password_path, :method => :put do |f|
4 .data 4 .data
5 - %p After successfull password update you will be redirected to login page where you should login with new password 5 + .alert-message.block-message.warning
  6 + %p After successfull password update you will be redirected to login page where you should login with new password
6 -if @user.errors.any? 7 -if @user.errors.any?
7 - #error_explanation 8 + .alert-message.block-message.error
8 %ul 9 %ul
9 - @user.errors.full_messages.each do |msg| 10 - @user.errors.full_messages.each do |msg|
10 %li= msg 11 %li= msg
app/views/projects/_form.html.haml
  Diff comments   View file @3f91da6
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 = f.label :default_branch, "Default Branch" 27 = f.label :default_branch, "Default Branch"
28 .input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;") 28 .input= f.select(:default_branch, @project.heads.map(&:name), {}, :style => "width:210px;")
29 29
30 - .well 30 + .alert-message.block-message.warning
31 %h5 Features 31 %h5 Features
32 32
33 .clearfix 33 .clearfix
app/views/projects/files.html.haml
  Diff comments   View file @3f91da6
1 = render "project_head" 1 = render "project_head"
2 - unless @notes.empty? 2 - unless @notes.empty?
3 - %div.update-data.ui-box.ui-box-small  
4 - .data  
5 - - @notes.each do |note|  
6 - %a.update-item{:href => note.attachment.url}  
7 - = image_tag gravatar_icon(note.author_email), :class => "left", :width => 16  
8 - %span.update-title{:style => "margin-bottom:0px;"} 3 + %table.zebra-striped.borders
  4 + - @notes.each do |note|
  5 + %tr
  6 + %td
  7 + %a{:href => note.attachment.url}
  8 + = image_tag gravatar_icon(note.author_email), :class => "left", :width => 16
  9 +  
9 = note.attachment_identifier 10 = note.attachment_identifier
10 - %span.update-author.right  
11 - Added  
12 - = time_ago_in_words(note.created_at)  
13 - ago 11 + %td
  12 + Added
  13 + = time_ago_in_words(note.created_at)
  14 + ago
14 - else 15 - else
15 .notice_holder 16 .notice_holder
16 %li All files attached to project wall, issues etc will be displayed here 17 %li All files attached to project wall, issues etc will be displayed here
app/views/repositories/_feed.html.haml
  Diff comments   View file @3f91da6
1 - commit = update 1 - commit = update
2 -.wll  
3 - = link_to project_commits_path(@project, :ref => commit.head.name) do  
4 - %p  
5 - %strong.label 2 +%tr
  3 + %td
  4 + = link_to project_commits_path(@project, :ref => commit.head.name) do
  5 + %strong
6 = commit.head.name 6 = commit.head.name
7 - %br 7 + %td
  8 + %div
8 %code= commit.id.to_s[0..10] 9 %code= commit.id.to_s[0..10]
9 = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16 10 = image_tag gravatar_icon(commit.author_email), :class => "", :width => 16
10 = truncate(commit.safe_message, :length => 40) 11 = truncate(commit.safe_message, :length => 40)
11 - %span.right.cgray  
12 - = time_ago_in_words(commit.committed_date)  
13 - ago 12 + %td
  13 + %span.right.cgray
  14 + = time_ago_in_words(commit.committed_date)
  15 + ago
app/views/repositories/branches.html.haml
  Diff comments   View file @3f91da6
1 = render "repositories/branches_head" 1 = render "repositories/branches_head"
2 - unless @branches.empty? 2 - unless @branches.empty?
3 - %table 3 + %table.zebra-striped.borders
4 %thead 4 %thead
5 %tr 5 %tr
6 %th Name 6 %th Name
app/views/repositories/show.html.haml
  Diff comments   View file @3f91da6
@@ -24,11 +24,10 @@ @@ -24,11 +24,10 @@
24 24
25 25
26 26
27 -.ui-box  
28 - %h5.cgray  
29 - Recent Branches 27 +%h5.cgray
  28 + Recently updated branches
30 29
31 - %ul.unstyled  
32 - - @activities.each do |update|  
33 - = render "repositories/feed", :update => update, :project => @project 30 +%table.zebra-striped.borders
  31 + - @activities.each do |update|
  32 + = render "repositories/feed", :update => update, :project => @project
34 33
app/views/repositories/tags.html.haml
  Diff comments   View file @3f91da6
1 = render "head" 1 = render "head"
2 - unless @tags.empty? 2 - unless @tags.empty?
3 - %ul.unstyled 3 + %table.zebra-striped.borders
4 - @tags.each do |tag| 4 - @tags.each do |tag|
5 - %li.wll  
6 - .span3.right 5 + %tr
  6 + %td
  7 + = tag.name
  8 + %code= tag.commit.id.to_s[0..10]
  9 + %span.update-author.right
  10 + = time_ago_in_words(tag.commit.committed_date)
  11 + ago
  12 +  
  13 + %td
7 - if can? current_user, :download_code, @project 14 - if can? current_user, :download_code, @project
8 = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small" 15 = link_to "Download", archive_project_repository_path(@project, :ref => tag.name), :class => "btn small"
9 = link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small" 16 = link_to "Commits", project_commits_path(@project, :ref => tag.name), :class => "btn small"
10 17
11 - = tag.name  
12 - %code= tag.commit.id.to_s[0..10]  
13 - %span.update-author.right  
14 - = time_ago_in_words(tag.commit.committed_date)  
15 - ago  
16 - else 18 - else
17 %h3 No tags 19 %h3 No tags
app/views/snippets/_snippet.html.haml
  Diff comments   View file @3f91da6
1 -%li.entry  
2 - %a{:href => project_snippet_path(snippet.project, snippet)}  
3 - %p  
4 - %strong  
5 - = truncate(snippet.title, :length => 60) 1 +%tr
  2 + %td
  3 + %a{:href => project_snippet_path(snippet.project, snippet)}
  4 + = truncate(snippet.title, :length => 60)
6 %span.right.cgray 5 %span.right.cgray
7 = snippet.file_name 6 = snippet.file_name
app/views/snippets/index.html.haml
  Diff comments   View file @3f91da6
@@ -9,4 +9,4 @@ @@ -9,4 +9,4 @@
9 To add new snippet - click on button. 9 To add new snippet - click on button.
10 10
11 - unless @snippets.fresh.empty? 11 - unless @snippets.fresh.empty?
12 - %ul.unstyled= render @snippets.fresh 12 + %table.zebra-striped.borders= render @snippets.fresh
app/views/team_members/show.html.haml
  Diff comments   View file @3f91da6
@@ -12,8 +12,8 @@ @@ -12,8 +12,8 @@
12 = link_to team_project_path(@project), :class => "" do 12 = link_to team_project_path(@project), :class => "" do
13 ← To team list 13 ← To team list
14 14
15 -%hr  
16 -%table.no-borders 15 +%br
  16 +%table.zebra-striped.borders
17 %tr 17 %tr
18 %td Name 18 %td Name
19 %td= user.name 19 %td= user.name
app/views/widgets/_project_member.html.haml
  Diff comments   View file @3f91da6
@@ -11,14 +11,14 @@ @@ -11,14 +11,14 @@
11 %p 11 %p
12 - if @project.issues_enabled 12 - if @project.issues_enabled
13 Assigned issues: 13 Assigned issues:
14 - = current_user.assigned_issues.count 14 + = current_user.assigned_issues.opened.count
15 %br 15 %br
16 - if @project.merge_requests_enabled 16 - if @project.merge_requests_enabled
17 Assigned merge request: 17 Assigned merge request:
18 - = current_user.assigned_merge_requests.count 18 + = current_user.assigned_merge_requests.opened.count
19 %br 19 %br
20 Your merge requests: 20 Your merge requests:
21 - = current_user.assigned_merge_requests.count 21 + = current_user.assigned_merge_requests.opened.count
22 .link_holder 22 .link_holder
23 = link_to project_team_member_path(@project, member), :title => current_user.name do 23 = link_to project_team_member_path(@project, member), :title => current_user.name do
24 = "Access: #{member.project_access_human} »" 24 = "Access: #{member.project_access_human} »"