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