diff options
Diffstat (limited to 'app')
33 files changed, 49 insertions, 49 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml index 32f77cc1a70..5833eaf5f3e 100644 --- a/app/views/admin/background_jobs/show.html.haml +++ b/app/views/admin/background_jobs/show.html.haml @@ -3,7 +3,7 @@ %hr -.ui-box +.panel.panel-default .title Sidekiq running processes .body - if @sidekiq_processes.empty? @@ -40,5 +40,5 @@ -.ui-box +.panel.panel-default %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"} diff --git a/app/views/admin/groups/show.html.haml b/app/views/admin/groups/show.html.haml index 594762f495e..1bc73285094 100644 --- a/app/views/admin/groups/show.html.haml +++ b/app/views/admin/groups/show.html.haml @@ -7,7 +7,7 @@ %hr .row .col-md-6 - .ui-box + .panel.panel-default .title Group info: %ul.well-list @@ -29,7 +29,7 @@ %strong = @group.created_at.stamp("March 1, 1999") - .ui-box + .panel.panel-default .title Projects %small @@ -45,7 +45,7 @@ %span.monospace= project.path_with_namespace + ".git" .col-md-6 - .ui-box + .panel.panel-default .title Add user(s) to the group: .body.form-holder @@ -60,7 +60,7 @@ = select_tag :group_access, options_for_select(UsersGroup.group_access_roles), class: "project-access-select select2" %hr = submit_tag 'Add users into group', class: "btn btn-create" - .ui-box + .panel.panel-default .title %strong #{@group.name} Group Members diff --git a/app/views/admin/hooks/index.html.haml b/app/views/admin/hooks/index.html.haml index b27523cbf2d..67f0c5d3dc5 100644 --- a/app/views/admin/hooks/index.html.haml +++ b/app/views/admin/hooks/index.html.haml @@ -22,7 +22,7 @@ %hr -if @hooks.any? - .ui-box + .panel.panel-default .title System hooks (#{@hooks.count}) %ul.well-list diff --git a/app/views/admin/projects/index.html.haml b/app/views/admin/projects/index.html.haml index 51ad702154f..0fef5e94047 100644 --- a/app/views/admin/projects/index.html.haml +++ b/app/views/admin/projects/index.html.haml @@ -37,7 +37,7 @@ = link_to "Reset", admin_projects_path, class: "btn" .col-md-8 - .ui-box + .panel.panel-default .title Projects (#{@projects.total_count}) .pull-right diff --git a/app/views/admin/projects/show.html.haml b/app/views/admin/projects/show.html.haml index 11f07743ace..b4c01bb9bf3 100644 --- a/app/views/admin/projects/show.html.haml +++ b/app/views/admin/projects/show.html.haml @@ -6,7 +6,7 @@ %hr .row .col-md-6 - .ui-box + .panel.panel-default .title Project info: %ul.well-list @@ -75,7 +75,7 @@ = visibility_level_icon(@project.visibility_level) = visibility_level_label(@project.visibility_level) - .ui-box + .panel.panel-default .title Transfer project .body @@ -92,7 +92,7 @@ .col-md-6 - if @group - .ui-box + .panel.panel-default .title %strong #{@group.name} group members (#{@group.users_groups.count}) @@ -103,7 +103,7 @@ - @group.users_groups.order('group_access DESC').each do |member| = render 'users_groups/users_group', member: member, show_controls: false - .ui-box + .panel.panel-default .title Project members %small diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml index f42ae7c6a01..37070a216d5 100644 --- a/app/views/admin/users/index.html.haml +++ b/app/views/admin/users/index.html.haml @@ -28,7 +28,7 @@ = link_to 'Reset', admin_users_path, class: "btn btn-cancel" .col-md-9 - .ui-box + .panel.panel-default .title Users (#{@users.total_count}) .pull-right diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 764b34499ab..1cc1ff0c435 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -14,7 +14,7 @@ .row .col-md-6 - .ui-box + .panel.panel-default .title Account: .pull-right @@ -118,7 +118,7 @@ .col-md-6 - if @user.users_groups.present? - .ui-box + .panel.panel-default .title Groups: %ul.well-list - @user.users_groups.each do |user_group| @@ -132,7 +132,7 @@ = link_to group_users_group_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do %i.icon-remove.icon-white - .ui-box + .panel.panel-default .title Projects (#{@projects.count}) %ul.well-list - @projects.sort_by(&:name_with_namespace).each do |project| diff --git a/app/views/dashboard/_groups.html.haml b/app/views/dashboard/_groups.html.haml index a6bc946bedc..b3254d2d9e0 100644 --- a/app/views/dashboard/_groups.html.haml +++ b/app/views/dashboard/_groups.html.haml @@ -1,4 +1,4 @@ -.ui-box +.panel.panel-default .title.clearfix = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' - if current_user.can_create_group? diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml index 44c7a4b8c80..e22eea32dd9 100644 --- a/app/views/dashboard/_projects.html.haml +++ b/app/views/dashboard/_projects.html.haml @@ -1,4 +1,4 @@ -.ui-box +.panel.panel-default .title.clearfix = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' - if current_user.can_create_project? diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index 4ded28058ed..44c1b30aa8d 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -1,4 +1,4 @@ -.ui-box +.panel.panel-default .title Projects (#{projects.count}) - if can? current_user, :create_projects, @group diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 2a5614cff6c..f3e2638d350 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -17,7 +17,7 @@ .col-md-10 .tab-content .tab-pane.active#tab-edit - .ui-box + .panel.panel-default .title %strong= @group.name group settings: @@ -61,7 +61,7 @@ = f.submit 'Save group', class: "btn btn-save" .tab-pane#tab-projects - .ui-box + .panel.panel-default .title %strong= @group.name projects: @@ -84,7 +84,7 @@ .nothing-here-block This group has no projects yet .tab-pane#tab-remove - .ui-box.ui-box-danger + .panel.panel-default.panel.panel-default-danger .title Remove group .body %p diff --git a/app/views/groups/members.html.haml b/app/views/groups/members.html.haml index cc5eba64372..ee5f9244bba 100644 --- a/app/views/groups/members.html.haml +++ b/app/views/groups/members.html.haml @@ -24,7 +24,7 @@ .js-toggle-content.hide.new-group-member-holder = render "new_group_member" -.ui-box.prepend-top-20 +.panel.panel-default.prepend-top-20 .title %strong #{@group.name} group members diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml index 87fa5ef57d2..5a684e1e56c 100644 --- a/app/views/help/index.html.haml +++ b/app/views/help/index.html.haml @@ -18,7 +18,7 @@ .row .col-md-4 - .ui-box + .panel.panel-default .title Quick help %ul.well-list @@ -34,7 +34,7 @@ = link_to "shortcuts", '#', onclick: "new Shortcuts()" .col-md-8 - .ui-box.documentation + .panel.panel-default.documentation .title Documentation = preserve do diff --git a/app/views/profiles/emails/index.html.haml b/app/views/profiles/emails/index.html.haml index b5f1e438ccb..5192c62dd44 100644 --- a/app/views/profiles/emails/index.html.haml +++ b/app/views/profiles/emails/index.html.haml @@ -9,7 +9,7 @@ %hr -.ui-box +.panel.panel-default .title Emails (#{@emails.count + 1}) %ul.well-list#emails-table diff --git a/app/views/profiles/groups/index.html.haml b/app/views/profiles/groups/index.html.haml index cebc0b6bccb..6367e047379 100644 --- a/app/views/profiles/groups/index.html.haml +++ b/app/views/profiles/groups/index.html.haml @@ -8,7 +8,7 @@ %p.light Group members have access to all a group's projects %hr -.ui-box +.panel.panel-default .title %strong Groups (#{@user_groups.count}) diff --git a/app/views/profiles/keys/index.html.haml b/app/views/profiles/keys/index.html.haml index 2e10fa8be8d..42fd547494a 100644 --- a/app/views/profiles/keys/index.html.haml +++ b/app/views/profiles/keys/index.html.haml @@ -10,7 +10,7 @@ %hr -.ui-box +.panel.panel-default .title SSH Keys (#{@keys.count}) %ul.well-list#keys-table diff --git a/app/views/profiles/keys/show.html.haml b/app/views/profiles/keys/show.html.haml index b6724a7cb5d..38ca5706408 100644 --- a/app/views/profiles/keys/show.html.haml +++ b/app/views/profiles/keys/show.html.haml @@ -1,6 +1,6 @@ .row .col-md-4 - .ui-box + .panel.panel-default .title SSH Key %ul.well-list diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index 57331bff31b..7ae05b19ef9 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -6,7 +6,7 @@ = render "form" - if @commits.present? - %div.ui-box + %div.panel.panel-default .title Commits (#{@commits.count}) - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 10674ccae46..51eb27aa957 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -106,7 +106,7 @@ .js-toggle-content.hide - if can? current_user, :archive_project, @project - .ui-box.ui-box-danger + .panel.panel-default.panel.panel-default-danger .title - if @project.archived? Unarchive project @@ -137,7 +137,7 @@ .nothing-here-block Only the project owner can archive a project - if can?(current_user, :change_namespace, @project) - .ui-box.ui-box-danger + .panel.panel-default.panel.panel-default-danger .title Transfer project .errors-holder .form-holder @@ -157,7 +157,7 @@ - else .nothing-here-block Only the project owner can transfer a project - .ui-box.ui-box-danger + .panel.panel-default.panel.panel-default-danger .title Rename repository .errors-holder .form-holder @@ -177,7 +177,7 @@ = f.submit 'Rename', class: "btn btn-remove" - if can?(current_user, :remove_project, @project) - .ui-box.ui-box-danger + .panel.panel-default.panel.panel-default-danger .title Remove project .body %p diff --git a/app/views/projects/hooks/index.html.haml b/app/views/projects/hooks/index.html.haml index 73171fbe99a..8bc8f264533 100644 --- a/app/views/projects/hooks/index.html.haml +++ b/app/views/projects/hooks/index.html.haml @@ -51,7 +51,7 @@ = f.submit "Add Web Hook", class: "btn btn-create" -if @hooks.any? - .ui-box + .panel.panel-default .title Web hooks (#{@hooks.count}) %ul.well-list diff --git a/app/views/projects/issues/_issues.html.haml b/app/views/projects/issues/_issues.html.haml index e85ff3a7865..1d0dcd7f074 100644 --- a/app/views/projects/issues/_issues.html.haml +++ b/app/views/projects/issues/_issues.html.haml @@ -61,7 +61,7 @@ = hidden_field_tag :status, params[:status] = button_tag "Update issues", class: "btn update_selected_issues btn-save" -.ui-box +.panel.panel-default %ul.well-list.issues-list = render @issues - if @issues.blank? diff --git a/app/views/projects/merge_requests/_new_submit.html.haml b/app/views/projects/merge_requests/_new_submit.html.haml index bdfa4444abf..46a3d98ea20 100644 --- a/app/views/projects/merge_requests/_new_submit.html.haml +++ b/app/views/projects/merge_requests/_new_submit.html.haml @@ -58,7 +58,7 @@ = f.submit 'Submit merge request', class: "btn btn-create" .mr-compare - %div.ui-box + %div.panel.panel-default .title Commits (#{@commits.count}) - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE diff --git a/app/views/projects/merge_requests/index.html.haml b/app/views/projects/merge_requests/index.html.haml index 12a72edb224..232d398c530 100644 --- a/app/views/projects/merge_requests/index.html.haml +++ b/app/views/projects/merge_requests/index.html.haml @@ -61,7 +61,7 @@ .pull-right = render 'shared/sort_dropdown' - .ui-box + .panel.panel-default %ul.well-list.mr-list = render @merge_requests - if @merge_requests.blank? diff --git a/app/views/projects/merge_requests/show/_commits.html.haml b/app/views/projects/merge_requests/show/_commits.html.haml index f69146e1a37..e37c6f4f3e7 100644 --- a/app/views/projects/merge_requests/show/_commits.html.haml +++ b/app/views/projects/merge_requests/show/_commits.html.haml @@ -1,5 +1,5 @@ - if @commits.present? - .ui-box + .panel.panel-default .title %i.icon-list Commits (#{@commits.count}) diff --git a/app/views/projects/milestones/_issues.html.haml b/app/views/projects/milestones/_issues.html.haml index c277dcc5364..16b412b3d8f 100644 --- a/app/views/projects/milestones/_issues.html.haml +++ b/app/views/projects/milestones/_issues.html.haml @@ -1,4 +1,4 @@ -.ui-box +.panel.panel-default .title= title %ul.well-list - issues.each do |issue| diff --git a/app/views/projects/milestones/index.html.haml b/app/views/projects/milestones/index.html.haml index 3537650ad43..15635b299f4 100644 --- a/app/views/projects/milestones/index.html.haml +++ b/app/views/projects/milestones/index.html.haml @@ -20,7 +20,7 @@ = link_to project_milestones_path(@project, f: "all") do All .col-md-9 - .ui-box + .panel.panel-default %ul.well-list = render @milestones diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 0fe5ac25b5e..f1eb2c7c9c9 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -84,13 +84,13 @@ .tab-pane#tab-merge-requests .row .col-md-6 - .ui-box + .panel.panel-default .title Open %ul.well-list - @merge_requests.opened.each do |merge_request| = render 'merge_request', merge_request: merge_request .col-md-6 - .ui-box + .panel.panel-default .title Closed %ul.well-list - @merge_requests.closed.each do |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 eceec6627b9..52be9d1f2d9 100644 --- a/app/views/projects/team_members/_group_members.html.haml +++ b/app/views/projects/team_members/_group_members.html.haml @@ -1,5 +1,5 @@ - group_users_count = @group.users_groups.count -.ui-box +.panel.panel-default .title %strong #{@group.name} group members (#{group_users_count}) diff --git a/app/views/projects/team_members/_team.html.haml b/app/views/projects/team_members/_team.html.haml index 2daf6847665..fae0b3c406a 100644 --- a/app/views/projects/team_members/_team.html.haml +++ b/app/views/projects/team_members/_team.html.haml @@ -1,6 +1,6 @@ .team-table - can_admin_project = (can? current_user, :admin_project, @project) - .ui-box + .panel.panel-default .title %strong #{@project.name} project members (#{members.count}) diff --git a/app/views/shared/_issues.html.haml b/app/views/shared/_issues.html.haml index 087b6632e8d..ad319849513 100644 --- a/app/views/shared/_issues.html.haml +++ b/app/views/shared/_issues.html.haml @@ -1,6 +1,6 @@ - if @issues.any? - @issues.group_by(&:project).each do |group| - .ui-box.ui-box-small + .panel.panel-default.panel.panel-default-small - project = group[0] .title = link_to_project project diff --git a/app/views/shared/_merge_requests.html.haml b/app/views/shared/_merge_requests.html.haml index f40b7be4864..cb461cd7133 100644 --- a/app/views/shared/_merge_requests.html.haml +++ b/app/views/shared/_merge_requests.html.haml @@ -1,6 +1,6 @@ - if @merge_requests.any? - @merge_requests.group_by(&:target_project).each do |group| - .ui-box.ui-box-small + .panel.panel-default.panel.panel-default-small - project = group[0] .title = link_to_project project diff --git a/app/views/users/_profile.html.haml b/app/views/users/_profile.html.haml index 7ffd43e837d..5c008ac8fed 100644 --- a/app/views/users/_profile.html.haml +++ b/app/views/users/_profile.html.haml @@ -1,4 +1,4 @@ -.ui-box +.panel.panel-default .title Profile %ul.well-list diff --git a/app/views/users/_projects.html.haml b/app/views/users/_projects.html.haml index a61c6ba5b86..7fc7aeb6b06 100644 --- a/app/views/users/_projects.html.haml +++ b/app/views/users/_projects.html.haml @@ -1,4 +1,4 @@ -.ui-box +.panel.panel-default .title Projects %ul.well-list - @projects.each do |project| |