summaryrefslogtreecommitdiff
path: root/app/views/admin
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-29 18:42:44 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-29 18:42:44 +0300
commit6dcbe1b43c50229fd0dff69eba2c6ab658d91ad2 (patch)
tree2b1d5ba6e1e6d14ae73956ea7ff26b5d0a9d8301 /app/views/admin
parente6beb6090320d6756369934c5151e36429c5d5f1 (diff)
downloadgitlab-ce-6dcbe1b43c50229fd0dff69eba2c6ab658d91ad2.tar.gz
Replace ui-box with panel.panel-default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/background_jobs/show.html.haml4
-rw-r--r--app/views/admin/groups/show.html.haml8
-rw-r--r--app/views/admin/hooks/index.html.haml2
-rw-r--r--app/views/admin/projects/index.html.haml2
-rw-r--r--app/views/admin/projects/show.html.haml8
-rw-r--r--app/views/admin/users/index.html.haml2
-rw-r--r--app/views/admin/users/show.html.haml6
7 files changed, 16 insertions, 16 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|