Download as
Browse Code »

Commit 38ff5d1ab9d9eb5d09bbc8498410b770445b698e

Authored by Dmitriy Zaporozhets
1 parent 6dcbe1b4
Exists in spb-stable and in 2 other branches 7-0-stable, 7-0-stable-spb

Replace ui-box title with panel-heading 

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing 30 changed files with 45 additions and 45 deletions   Show diff stats
app/views/admin/background_jobs/show.html.haml
  Diff comments   View file @38ff5d1
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 %hr 4 %hr
5 5
6 .panel.panel-default 6 .panel.panel-default
7 - .title Sidekiq running processes 7 + .panel-heading Sidekiq running processes
8 .body 8 .body
9 - if @sidekiq_processes.empty? 9 - if @sidekiq_processes.empty?
10 %h4.cred 10 %h4.cred
app/views/admin/groups/show.html.haml
  Diff comments   View file @38ff5d1
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 .row 8 .row
9 .col-md-6 9 .col-md-6
10 .panel.panel-default 10 .panel.panel-default
11 - .title 11 + .panel-heading
12 Group info: 12 Group info:
13 %ul.well-list 13 %ul.well-list
14 %li 14 %li
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 = @group.created_at.stamp("March 1, 1999") 30 = @group.created_at.stamp("March 1, 1999")
31 31
32 .panel.panel-default 32 .panel.panel-default
33 - .title 33 + .panel-heading
34 Projects 34 Projects
35 %small 35 %small
36 (#{@group.projects.count}) 36 (#{@group.projects.count})
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 46
47 .col-md-6 47 .col-md-6
48 .panel.panel-default 48 .panel.panel-default
49 - .title 49 + .panel-heading
50 Add user(s) to the group: 50 Add user(s) to the group:
51 .body.form-holder 51 .body.form-holder
52 %p.light 52 %p.light
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 %hr 61 %hr
62 = submit_tag 'Add users into group', class: "btn btn-create" 62 = submit_tag 'Add users into group', class: "btn btn-create"
63 .panel.panel-default 63 .panel.panel-default
64 - .title 64 + .panel-heading
65 %strong #{@group.name} 65 %strong #{@group.name}
66 Group Members 66 Group Members
67 %small 67 %small
app/views/admin/hooks/index.html.haml
  Diff comments   View file @38ff5d1
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 23
24 -if @hooks.any? 24 -if @hooks.any?
25 .panel.panel-default 25 .panel.panel-default
26 - .title 26 + .panel-heading
27 System hooks (#{@hooks.count}) 27 System hooks (#{@hooks.count})
28 %ul.well-list 28 %ul.well-list
29 - @hooks.each do |hook| 29 - @hooks.each do |hook|
app/views/admin/projects/index.html.haml
  Diff comments   View file @38ff5d1
@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 38
39 .col-md-8 39 .col-md-8
40 .panel.panel-default 40 .panel.panel-default
41 - .title 41 + .panel-heading
42 Projects (#{@projects.total_count}) 42 Projects (#{@projects.total_count})
43 .pull-right 43 .pull-right
44 .dropdown.inline 44 .dropdown.inline
app/views/admin/projects/show.html.haml
  Diff comments   View file @38ff5d1
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 .row 7 .row
8 .col-md-6 8 .col-md-6
9 .panel.panel-default 9 .panel.panel-default
10 - .title 10 + .panel-heading
11 Project info: 11 Project info:
12 %ul.well-list 12 %ul.well-list
13 %li 13 %li
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 = visibility_level_label(@project.visibility_level) 76 = visibility_level_label(@project.visibility_level)
77 77
78 .panel.panel-default 78 .panel.panel-default
79 - .title 79 + .panel-heading
80 Transfer project 80 Transfer project
81 .body 81 .body
82 = form_for @project, url: transfer_admin_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f| 82 = form_for @project, url: transfer_admin_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f|
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 .col-md-6 93 .col-md-6
94 - if @group 94 - if @group
95 .panel.panel-default 95 .panel.panel-default
96 - .title 96 + .panel-heading
97 %strong #{@group.name} 97 %strong #{@group.name}
98 group members (#{@group.users_groups.count}) 98 group members (#{@group.users_groups.count})
99 .pull-right 99 .pull-right
@@ -104,7 +104,7 @@ @@ -104,7 +104,7 @@
104 = render 'users_groups/users_group', member: member, show_controls: false 104 = render 'users_groups/users_group', member: member, show_controls: false
105 105
106 .panel.panel-default 106 .panel.panel-default
107 - .title 107 + .panel-heading
108 Project members 108 Project members
109 %small 109 %small
110 (#{@project.users.count}) 110 (#{@project.users.count})
app/views/admin/users/index.html.haml
  Diff comments   View file @38ff5d1
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 29
30 .col-md-9 30 .col-md-9
31 .panel.panel-default 31 .panel.panel-default
32 - .title 32 + .panel-heading
33 Users (#{@users.total_count}) 33 Users (#{@users.total_count})
34 .pull-right 34 .pull-right
35 = link_to 'New User', new_admin_user_path, class: "btn btn-new" 35 = link_to 'New User', new_admin_user_path, class: "btn btn-new"
app/views/admin/users/show.html.haml
  Diff comments   View file @38ff5d1
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 .row 15 .row
16 .col-md-6 16 .col-md-6
17 .panel.panel-default 17 .panel.panel-default
18 - .title 18 + .panel-heading
19 Account: 19 Account:
20 .pull-right 20 .pull-right
21 = image_tag avatar_icon(@user.email, 32), class: "avatar s32" 21 = image_tag avatar_icon(@user.email, 32), class: "avatar s32"
@@ -119,7 +119,7 @@ @@ -119,7 +119,7 @@
119 .col-md-6 119 .col-md-6
120 - if @user.users_groups.present? 120 - if @user.users_groups.present?
121 .panel.panel-default 121 .panel.panel-default
122 - .title Groups: 122 + .panel-heading Groups:
123 %ul.well-list 123 %ul.well-list
124 - @user.users_groups.each do |user_group| 124 - @user.users_groups.each do |user_group|
125 - group = user_group.group 125 - group = user_group.group
@@ -133,7 +133,7 @@ @@ -133,7 +133,7 @@
133 %i.icon-remove.icon-white 133 %i.icon-remove.icon-white
134 134
135 .panel.panel-default 135 .panel.panel-default
136 - .title Projects (#{@projects.count}) 136 + .panel-heading Projects (#{@projects.count})
137 %ul.well-list 137 %ul.well-list
138 - @projects.sort_by(&:name_with_namespace).each do |project| 138 - @projects.sort_by(&:name_with_namespace).each do |project|
139 - tm = project.team.find_tm(@user.id) 139 - tm = project.team.find_tm(@user.id)
app/views/dashboard/_groups.html.haml
  Diff comments   View file @38ff5d1
1 .panel.panel-default 1 .panel.panel-default
2 - .title.clearfix 2 + .panel-heading.clearfix
3 = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' 3 = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
4 - if current_user.can_create_group? 4 - if current_user.can_create_group?
5 %span.pull-right 5 %span.pull-right
app/views/dashboard/_projects.html.haml
  Diff comments   View file @38ff5d1
1 .panel.panel-default 1 .panel.panel-default
2 - .title.clearfix 2 + .panel-heading.clearfix
3 = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' 3 = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
4 - if current_user.can_create_project? 4 - if current_user.can_create_project?
5 %span.pull-right 5 %span.pull-right
app/views/groups/_projects.html.haml
  Diff comments   View file @38ff5d1
1 .panel.panel-default 1 .panel.panel-default
2 - .title 2 + .panel-heading
3 Projects (#{projects.count}) 3 Projects (#{projects.count})
4 - if can? current_user, :create_projects, @group 4 - if can? current_user, :create_projects, @group
5 %span.pull-right 5 %span.pull-right
app/views/groups/edit.html.haml
  Diff comments   View file @38ff5d1
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 .tab-content 18 .tab-content
19 .tab-pane.active#tab-edit 19 .tab-pane.active#tab-edit
20 .panel.panel-default 20 .panel.panel-default
21 - .title 21 + .panel-heading
22 %strong= @group.name 22 %strong= @group.name
23 group settings: 23 group settings:
24 %div.form-holder 24 %div.form-holder
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 62
63 .tab-pane#tab-projects 63 .tab-pane#tab-projects
64 .panel.panel-default 64 .panel.panel-default
65 - .title 65 + .panel-heading
66 %strong= @group.name 66 %strong= @group.name
67 projects: 67 projects:
68 - if can? current_user, :manage_group, @group 68 - if can? current_user, :manage_group, @group
@@ -85,7 +85,7 @@ @@ -85,7 +85,7 @@
85 85
86 .tab-pane#tab-remove 86 .tab-pane#tab-remove
87 .panel.panel-default.panel.panel-default-danger 87 .panel.panel-default.panel.panel-default-danger
88 - .title Remove group 88 + .panel-heading Remove group
89 .body 89 .body
90 %p 90 %p
91 Removing group will cause all child projects and resources to be removed. 91 Removing group will cause all child projects and resources to be removed.
app/views/groups/members.html.haml
  Diff comments   View file @38ff5d1
@@ -25,7 +25,7 @@ @@ -25,7 +25,7 @@
25 = render "new_group_member" 25 = render "new_group_member"
26 26
27 .panel.panel-default.prepend-top-20 27 .panel.panel-default.prepend-top-20
28 - .title 28 + .panel-heading
29 %strong #{@group.name} 29 %strong #{@group.name}
30 group members 30 group members
31 %small 31 %small
app/views/help/index.html.haml
  Diff comments   View file @38ff5d1
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 .row 19 .row
20 .col-md-4 20 .col-md-4
21 .panel.panel-default 21 .panel.panel-default
22 - .title 22 + .panel-heading
23 Quick help 23 Quick help
24 %ul.well-list 24 %ul.well-list
25 %li 25 %li
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 35
36 .col-md-8 36 .col-md-8
37 .panel.panel-default.documentation 37 .panel.panel-default.documentation
38 - .title Documentation 38 + .panel-heading Documentation
39 39
40 = preserve do 40 = preserve do
41 - readme_text = File.read(Rails.root.join("doc", "README.md")) 41 - readme_text = File.read(Rails.root.join("doc", "README.md"))
app/views/profiles/emails/index.html.haml
  Diff comments   View file @38ff5d1
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 %hr 10 %hr
11 11
12 .panel.panel-default 12 .panel.panel-default
13 - .title 13 + .panel-heading
14 Emails (#{@emails.count + 1}) 14 Emails (#{@emails.count + 1})
15 %ul.well-list#emails-table 15 %ul.well-list#emails-table
16 %li 16 %li
app/views/profiles/groups/index.html.haml
  Diff comments   View file @38ff5d1
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 Group members have access to all a group's projects 9 Group members have access to all a group's projects
10 %hr 10 %hr
11 .panel.panel-default 11 .panel.panel-default
12 - .title 12 + .panel-heading
13 %strong Groups 13 %strong Groups
14 (#{@user_groups.count}) 14 (#{@user_groups.count})
15 %ul.well-list 15 %ul.well-list
app/views/profiles/keys/index.html.haml
  Diff comments   View file @38ff5d1
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 11
12 12
13 .panel.panel-default 13 .panel.panel-default
14 - .title 14 + .panel-heading
15 SSH Keys (#{@keys.count}) 15 SSH Keys (#{@keys.count})
16 %ul.well-list#keys-table 16 %ul.well-list#keys-table
17 = render @keys 17 = render @keys
app/views/profiles/keys/show.html.haml
  Diff comments   View file @38ff5d1
1 .row 1 .row
2 .col-md-4 2 .col-md-4
3 .panel.panel-default 3 .panel.panel-default
4 - .title 4 + .panel-heading
5 SSH Key 5 SSH Key
6 %ul.well-list 6 %ul.well-list
7 %li 7 %li
app/views/projects/compare/show.html.haml
  Diff comments   View file @38ff5d1
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 7
8 - if @commits.present? 8 - if @commits.present?
9 %div.panel.panel-default 9 %div.panel.panel-default
10 - .title 10 + .panel-heading
11 Commits (#{@commits.count}) 11 Commits (#{@commits.count})
12 - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE 12 - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
13 %ul.well-list 13 %ul.well-list
app/views/projects/edit.html.haml
  Diff comments   View file @38ff5d1
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 .js-toggle-content.hide 107 .js-toggle-content.hide
108 - if can? current_user, :archive_project, @project 108 - if can? current_user, :archive_project, @project
109 .panel.panel-default.panel.panel-default-danger 109 .panel.panel-default.panel.panel-default-danger
110 - .title 110 + .panel-heading
111 - if @project.archived? 111 - if @project.archived?
112 Unarchive project 112 Unarchive project
113 - else 113 - else
@@ -138,7 +138,7 @@ @@ -138,7 +138,7 @@
138 138
139 - if can?(current_user, :change_namespace, @project) 139 - if can?(current_user, :change_namespace, @project)
140 .panel.panel-default.panel.panel-default-danger 140 .panel.panel-default.panel.panel-default-danger
141 - .title Transfer project 141 + .panel-heading Transfer project
142 .errors-holder 142 .errors-holder
143 .form-holder 143 .form-holder
144 = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f| 144 = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f|
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 .nothing-here-block Only the project owner can transfer a project 158 .nothing-here-block Only the project owner can transfer a project
159 159
160 .panel.panel-default.panel.panel-default-danger 160 .panel.panel-default.panel.panel-default-danger
161 - .title Rename repository 161 + .panel-heading Rename repository
162 .errors-holder 162 .errors-holder
163 .form-holder 163 .form-holder
164 = form_for(@project, html: { class: 'form-horizontal' }) do |f| 164 = form_for(@project, html: { class: 'form-horizontal' }) do |f|
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 178
179 - if can?(current_user, :remove_project, @project) 179 - if can?(current_user, :remove_project, @project)
180 .panel.panel-default.panel.panel-default-danger 180 .panel.panel-default.panel.panel-default-danger
181 - .title Remove project 181 + .panel-heading Remove project
182 .body 182 .body
183 %p 183 %p
184 Removing the project will delete its repository and all related resources including issues, merge requests etc. 184 Removing the project will delete its repository and all related resources including issues, merge requests etc.
app/views/projects/hooks/index.html.haml
  Diff comments   View file @38ff5d1
@@ -52,7 +52,7 @@ @@ -52,7 +52,7 @@
52 52
53 -if @hooks.any? 53 -if @hooks.any?
54 .panel.panel-default 54 .panel.panel-default
55 - .title 55 + .panel-heading
56 Web hooks (#{@hooks.count}) 56 Web hooks (#{@hooks.count})
57 %ul.well-list 57 %ul.well-list
58 - @hooks.each do |hook| 58 - @hooks.each do |hook|
app/views/projects/merge_requests/_new_submit.html.haml
  Diff comments   View file @38ff5d1
@@ -59,7 +59,7 @@ @@ -59,7 +59,7 @@
59 59
60 .mr-compare 60 .mr-compare
61 %div.panel.panel-default 61 %div.panel.panel-default
62 - .title 62 + .panel-heading
63 Commits (#{@commits.count}) 63 Commits (#{@commits.count})
64 - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE 64 - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE
65 %ul.well-list 65 %ul.well-list
app/views/projects/merge_requests/show/_commits.html.haml
  Diff comments   View file @38ff5d1
1 - if @commits.present? 1 - if @commits.present?
2 .panel.panel-default 2 .panel.panel-default
3 - .title 3 + .panel-heading
4 %i.icon-list 4 %i.icon-list
5 Commits (#{@commits.count}) 5 Commits (#{@commits.count})
6 .commits 6 .commits
app/views/projects/milestones/_issues.html.haml
  Diff comments   View file @38ff5d1
1 .panel.panel-default 1 .panel.panel-default
2 - .title= title 2 + .panel-heading= title
3 %ul.well-list 3 %ul.well-list
4 - issues.each do |issue| 4 - issues.each do |issue|
5 %li 5 %li
app/views/projects/milestones/show.html.haml
  Diff comments   View file @38ff5d1
@@ -85,13 +85,13 @@ @@ -85,13 +85,13 @@
85 .row 85 .row
86 .col-md-6 86 .col-md-6
87 .panel.panel-default 87 .panel.panel-default
88 - .title Open 88 + .panel-heading Open
89 %ul.well-list 89 %ul.well-list
90 - @merge_requests.opened.each do |merge_request| 90 - @merge_requests.opened.each do |merge_request|
91 = render 'merge_request', merge_request: merge_request 91 = render 'merge_request', merge_request: merge_request
92 .col-md-6 92 .col-md-6
93 .panel.panel-default 93 .panel.panel-default
94 - .title Closed 94 + .panel-heading Closed
95 %ul.well-list 95 %ul.well-list
96 - @merge_requests.closed.each do |merge_request| 96 - @merge_requests.closed.each do |merge_request|
97 = render 'merge_request', merge_request: merge_request 97 = render 'merge_request', merge_request: merge_request
app/views/projects/team_members/_group_members.html.haml
  Diff comments   View file @38ff5d1
1 - group_users_count = @group.users_groups.count 1 - group_users_count = @group.users_groups.count
2 .panel.panel-default 2 .panel.panel-default
3 - .title 3 + .panel-heading
4 %strong #{@group.name} 4 %strong #{@group.name}
5 group members (#{group_users_count}) 5 group members (#{group_users_count})
6 .pull-right 6 .pull-right
app/views/projects/team_members/_team.html.haml
  Diff comments   View file @38ff5d1
1 .team-table 1 .team-table
2 - can_admin_project = (can? current_user, :admin_project, @project) 2 - can_admin_project = (can? current_user, :admin_project, @project)
3 .panel.panel-default 3 .panel.panel-default
4 - .title 4 + .panel-heading
5 %strong #{@project.name} 5 %strong #{@project.name}
6 project members (#{members.count}) 6 project members (#{members.count})
7 %ul.well-list 7 %ul.well-list
app/views/shared/_issues.html.haml
  Diff comments   View file @38ff5d1
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 - @issues.group_by(&:project).each do |group| 2 - @issues.group_by(&:project).each do |group|
3 .panel.panel-default.panel.panel-default-small 3 .panel.panel-default.panel.panel-default-small
4 - project = group[0] 4 - project = group[0]
5 - .title 5 + .panel-heading
6 = link_to_project project 6 = link_to_project project
7 = link_to 'show all', project_issues_path(project), class: 'pull-right' 7 = link_to 'show all', project_issues_path(project), class: 'pull-right'
8 8
app/views/shared/_merge_requests.html.haml
  Diff comments   View file @38ff5d1
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 - @merge_requests.group_by(&:target_project).each do |group| 2 - @merge_requests.group_by(&:target_project).each do |group|
3 .panel.panel-default.panel.panel-default-small 3 .panel.panel-default.panel.panel-default-small
4 - project = group[0] 4 - project = group[0]
5 - .title 5 + .panel-heading
6 = link_to_project project 6 = link_to_project project
7 = link_to 'show all', project_merge_requests_path(project), class: 'pull-right' 7 = link_to 'show all', project_merge_requests_path(project), class: 'pull-right'
8 %ul.well-list.mr-list 8 %ul.well-list.mr-list
app/views/users/_profile.html.haml
  Diff comments   View file @38ff5d1
1 .panel.panel-default 1 .panel.panel-default
2 - .title 2 + .panel-heading
3 Profile 3 Profile
4 %ul.well-list 4 %ul.well-list
5 %li 5 %li
app/views/users/_projects.html.haml
  Diff comments   View file @38ff5d1
1 .panel.panel-default 1 .panel.panel-default
2 - .title Projects 2 + .panel-heading Projects
3 %ul.well-list 3 %ul.well-list
4 - @projects.each do |project| 4 - @projects.each do |project|
5 %li 5 %li