diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-29 19:43:21 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-29 19:43:21 +0400 |
commit | 38ff5d1ab9d9eb5d09bbc8498410b770445b698e (patch) | |
tree | 75702af7d725741715011a85c9093b9ac2114ce9 /app/views | |
parent | 6dcbe1b43c50229fd0dff69eba2c6ab658d91ad2 (diff) |
Replace ui-box title with panel-heading
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views')
30 files changed, 45 insertions, 45 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml index 5833eaf5f3e..dcb3bfcda6e 100644 --- a/app/views/admin/background_jobs/show.html.haml +++ b/app/views/admin/background_jobs/show.html.haml @@ -4,7 +4,7 @@ %hr .panel.panel-default - .title Sidekiq running processes + .panel-heading Sidekiq running processes .body - if @sidekiq_processes.empty? %h4.cred diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 1bc73285094..2b7dbfad59d 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -8,7 +8,7 @@ .row .col-md-6 .panel.panel-default - .title + .panel-heading Group info: %ul.well-list %li @@ -30,7 +30,7 @@ = @group.created_at.stamp("March 1, 1999") .panel.panel-default - .title + .panel-heading Projects %small (#{@group.projects.count}) @@ -46,7 +46,7 @@ .col-md-6 .panel.panel-default - .title + .panel-heading Add user(s) to the group: .body.form-holder %p.light @@ -61,7 +61,7 @@ %hr = submit_tag 'Add users into group', class: "btn btn-create" .panel.panel-default - .title + .panel-heading %strong #{@group.name} Group Members %small diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index 67f0c5d3dc5..0c5db0805f9 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -23,7 +23,7 @@ -if @hooks.any? .panel.panel-default - .title + .panel-heading System hooks (#{@hooks.count}) %ul.well-list - @hooks.each do |hook| diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 0fef5e94047..fb462840baa 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -38,7 +38,7 @@ .col-md-8 .panel.panel-default - .title + .panel-heading Projects (#{@projects.total_count}) .pull-right .dropdown.inline diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index b4c01bb9bf3..3fe188a57ea 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -7,7 +7,7 @@ .row .col-md-6 .panel.panel-default - .title + .panel-heading Project info: %ul.well-list %li @@ -76,7 +76,7 @@ = visibility_level_label(@project.visibility_level) .panel.panel-default - .title + .panel-heading Transfer project .body = form_for @project, url: transfer_admin_project_path(@project), method: :put, html: { class: 'form-horizontal' } do |f| @@ -93,7 +93,7 @@ .col-md-6 - if @group .panel.panel-default - .title + .panel-heading %strong #{@group.name} group members (#{@group.users_groups.count}) .pull-right @@ -104,7 +104,7 @@ = render 'users_groups/users_group', member: member, show_controls: false .panel.panel-default - .title + .panel-heading Project members %small (#{@project.users.count}) diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index 37070a216d5..4bfdcbc4de2 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -29,7 +29,7 @@ .col-md-9 .panel.panel-default - .title + .panel-heading Users (#{@users.total_count}) .pull-right = link_to 'New User', new_admin_user_path, class: "btn btn-new" diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 1cc1ff0c435..28c91c2c3e2 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -15,7 +15,7 @@ .row .col-md-6 .panel.panel-default - .title + .panel-heading Account: .pull-right = image_tag avatar_icon(@user.email, 32), class: "avatar s32" @@ -119,7 +119,7 @@ .col-md-6 - if @user.users_groups.present? .panel.panel-default - .title Groups: + .panel-heading Groups: %ul.well-list - @user.users_groups.each do |user_group| - group = user_group.group @@ -133,7 +133,7 @@ %i.icon-remove.icon-white .panel.panel-default - .title Projects (#{@projects.count}) + .panel-heading Projects (#{@projects.count}) %ul.well-list - @projects.sort_by(&:name_with_namespace).each do |project| - tm = project.team.find_tm(@user.id) diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml index b3254d2d9e0..cb9c18b7966 100644 --- a/app/views/dashboard/_groups.html.haml +++ b/app/views/dashboard/_groups.html.haml @@ -1,5 +1,5 @@ .panel.panel-default - .title.clearfix + .panel-heading.clearfix = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' - if current_user.can_create_group? %span.pull-right diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml index e22eea32dd9..f2cd57504c1 100644 --- a/app/views/dashboard/_projects.html.haml +++ b/app/views/dashboard/_projects.html.haml @@ -1,5 +1,5 @@ .panel.panel-default - .title.clearfix + .panel-heading.clearfix = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' - if current_user.can_create_project? %span.pull-right diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index 44c1b30aa8d..520310bc433 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -1,5 +1,5 @@ .panel.panel-default - .title + .panel-heading Projects (#{projects.count}) - if can? current_user, :create_projects, @group %span.pull-right diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index f3e2638d350..e04b5ba7ef4 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -18,7 +18,7 @@ .tab-content .tab-pane.active#tab-edit .panel.panel-default - .title + .panel-heading %strong= @group.name group settings: %div.form-holder @@ -62,7 +62,7 @@ .tab-pane#tab-projects .panel.panel-default - .title + .panel-heading %strong= @group.name projects: - if can? current_user, :manage_group, @group @@ -85,7 +85,7 @@ .tab-pane#tab-remove .panel.panel-default.panel.panel-default-danger - .title Remove group + .panel-heading Remove group .body %p Removing group will cause all child projects and resources to be removed. diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml index ee5f9244bba..19819c96124 100644 --- a/app/views/groups/members.html.haml +++ b/app/views/groups/members.html.haml @@ -25,7 +25,7 @@ = render "new_group_member" .panel.panel-default.prepend-top-20 - .title + .panel-heading %strong #{@group.name} group members %small diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 5a684e1e56c..1b714429f14 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -19,7 +19,7 @@ .row .col-md-4 .panel.panel-default - .title + .panel-heading Quick help %ul.well-list %li @@ -35,7 +35,7 @@ .col-md-8 .panel.panel-default.documentation - .title Documentation + .panel-heading Documentation = preserve do - readme_text = File.read(Rails.root.join("doc", "README.md")) diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml index 5192c62dd44..ca980db2f3c 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -10,7 +10,7 @@ %hr .panel.panel-default - .title + .panel-heading Emails (#{@emails.count + 1}) %ul.well-list#emails-table %li diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml index 6367e047379..2efe72b1bb3 100644 --- a/app/views/profiles/groups/index.html.haml +++ b/app/views/profiles/groups/index.html.haml @@ -9,7 +9,7 @@ Group members have access to all a group's projects %hr .panel.panel-default - .title + .panel-heading %strong Groups (#{@user_groups.count}) %ul.well-list diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml index 42fd547494a..aabfd57c286 100644 --- a/app/views/profiles/keys/index.html.haml +++ b/app/views/profiles/keys/index.html.haml @@ -11,7 +11,7 @@ .panel.panel-default - .title + .panel-heading SSH Keys (#{@keys.count}) %ul.well-list#keys-table = render @keys diff --git a/app/views/profiles/keys/show.html.haml b/app/views/profiles/keys/show.html.haml index 38ca5706408..c4fc1bb269c 100644 --- a/app/views/profiles/keys/show.html.haml +++ b/app/views/profiles/keys/show.html.haml @@ -1,7 +1,7 @@ .row .col-md-4 .panel.panel-default - .title + .panel-heading SSH Key %ul.well-list %li diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index 7ae05b19ef9..88122a73bba 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -7,7 +7,7 @@ - if @commits.present? %div.panel.panel-default - .title + .panel-heading Commits (#{@commits.count}) - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE %ul.well-list diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 51eb27aa957..0a45f7e1303 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -107,7 +107,7 @@ .js-toggle-content.hide - if can? current_user, :archive_project, @project .panel.panel-default.panel.panel-default-danger - .title + .panel-heading - if @project.archived? Unarchive project - else @@ -138,7 +138,7 @@ - if can?(current_user, :change_namespace, @project) .panel.panel-default.panel.panel-default-danger - .title Transfer project + .panel-heading Transfer project .errors-holder .form-holder = form_for(@project, url: transfer_project_path(@project), method: :put, remote: true, html: { class: 'transfer-project form-horizontal' }) do |f| @@ -158,7 +158,7 @@ .nothing-here-block Only the project owner can transfer a project .panel.panel-default.panel.panel-default-danger - .title Rename repository + .panel-heading Rename repository .errors-holder .form-holder = form_for(@project, html: { class: 'form-horizontal' }) do |f| @@ -178,7 +178,7 @@ - if can?(current_user, :remove_project, @project) .panel.panel-default.panel.panel-default-danger - .title Remove project + .panel-heading Remove project .body %p Removing the project will delete its repository and all related resources including issues, merge requests etc. diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index 8bc8f264533..9a003c87f68 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -52,7 +52,7 @@ -if @hooks.any? .panel.panel-default - .title + .panel-heading Web hooks (#{@hooks.count}) %ul.well-list - @hooks.each do |hook| diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index 46a3d98ea20..553bc30ee08 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -59,7 +59,7 @@ .mr-compare %div.panel.panel-default - .title + .panel-heading Commits (#{@commits.count}) - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE %ul.well-list diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml index e37c6f4f3e7..e62ab9d9d30 100644 --- a/app/views/projects/merge_requests/show/_commits.html.haml +++ b/app/views/projects/merge_requests/show/_commits.html.haml @@ -1,6 +1,6 @@ - if @commits.present? .panel.panel-default - .title + .panel-heading %i.icon-list Commits (#{@commits.count}) .commits diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml index 16b412b3d8f..83eb327975b 100644 --- a/app/views/projects/milestones/_issues.html.haml +++ b/app/views/projects/milestones/_issues.html.haml @@ -1,5 +1,5 @@ .panel.panel-default - .title= title + .panel-heading= title %ul.well-list - issues.each do |issue| %li diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index f1eb2c7c9c9..e33f4e5273c 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -85,13 +85,13 @@ .row .col-md-6 .panel.panel-default - .title Open + .panel-heading Open %ul.well-list - @merge_requests.opened.each do |merge_request| = render 'merge_request', merge_request: merge_request .col-md-6 .panel.panel-default - .title Closed + .panel-heading Closed %ul.well-list - @merge_requests.closed.each do |merge_request| = render 'merge_request', merge_request: merge_request diff --git a/app/views/projects/team_members/_group_members.html.haml b/app/views/projects/team_members/_group_members.html.haml index 52be9d1f2d9..83c4b6f87d5 100644 --- a/app/views/projects/team_members/_group_members.html.haml +++ b/app/views/projects/team_members/_group_members.html.haml @@ -1,6 +1,6 @@ - group_users_count = @group.users_groups.count .panel.panel-default - .title + .panel-heading %strong #{@group.name} group members (#{group_users_count}) .pull-right diff --git a/app/views/projects/team_members/_team.html.haml b/app/views/projects/team_members/_team.html.haml index fae0b3c406a..0e5b8176132 100644 --- a/app/views/projects/team_members/_team.html.haml +++ b/app/views/projects/team_members/_team.html.haml @@ -1,7 +1,7 @@ .team-table - can_admin_project = (can? current_user, :admin_project, @project) .panel.panel-default - .title + .panel-heading %strong #{@project.name} project members (#{members.count}) %ul.well-list diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml index ad319849513..d36e96dc49a 100644 --- a/app/views/shared/_issues.html.haml +++ b/app/views/shared/_issues.html.haml @@ -2,7 +2,7 @@ - @issues.group_by(&:project).each do |group| .panel.panel-default.panel.panel-default-small - project = group[0] - .title + .panel-heading = link_to_project project = link_to 'show all', project_issues_path(project), class: 'pull-right' diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index cb461cd7133..954b16cfdb5 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -2,7 +2,7 @@ - @merge_requests.group_by(&:target_project).each do |group| .panel.panel-default.panel.panel-default-small - project = group[0] - .title + .panel-heading = link_to_project project = link_to 'show all', project_merge_requests_path(project), class: 'pull-right' %ul.well-list.mr-list diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml index 5c008ac8fed..3b44959baad 100644 --- a/app/views/users/_profile.html.haml +++ b/app/views/users/_profile.html.haml @@ -1,5 +1,5 @@ .panel.panel-default - .title + .panel-heading Profile %ul.well-list %li diff --git a/app/views/users/_projects.html.haml b/app/views/users/_projects.html.haml index 7fc7aeb6b06..2d97c4545b9 100644 --- a/app/views/users/_projects.html.haml +++ b/app/views/users/_projects.html.haml @@ -1,5 +1,5 @@ .panel.panel-default - .title Projects + .panel-heading Projects %ul.well-list - @projects.each do |project| %li |