Improve UI for Project settings page

1 files changed, 58 insertions, 45 deletions

diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 2045941efd4..75226afc177 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -1,10 +1,11 @@
 .project-edit-container
   .project-edit-errors
   .project-edit-content
-    .ui-box.white
-      .title
-        %strong= @project.name
-        project settings:
+    %div
+      %h3.page-title
+        Project settings:
+      %p.light Some settings like transferring project are hidden inside danger area below
+      %hr
       .form-holder
         = form_for(@project, remote: true) do |f|
           %fieldset
@@ -100,56 +101,68 @@
           .form-actions
             = f.submit 'Save changes', class: "btn btn-save"
 
-    - if can?(current_user, :change_namespace, @project)
+
+
+    %center.light.prepend-top-20.padded
+      %h3
+        %i.icon-warning-sign
+        Dangerous settings
+      %p Project settings below may result in data loss!
+      = link_to '#', class: 'btn js-toggle-visibility-link' do
+        Show it to me
+        %i.icon-chevron-down
+
+    .js-toggle-visibility-container.hide
+      - if can?(current_user, :change_namespace, @project)
+        .ui-box.ui-box-danger
+          .title Transfer project
+          .errors-holder
+          .form-holder
+            = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
+              .control-group
+                = f.label :namespace_id do
+                  %span Namespace
+                .controls
+                  .control-group
+                    = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}
+                  %ul
+                    %li Be careful. Changing project namespace can have unintended side effects
+                    %li You can transfer project only to namespaces you can manage
+                    %li You will need to update your local repositories to point to the new location.
+              .form-actions
+                = f.submit 'Transfer', class: "btn btn-remove"
+      - else
+        %p.nothing_here_message Only project owner can transfer a project
+
       .ui-box.ui-box-danger
-        .title Transfer project
+        .title Rename repository
         .errors-holder
         .form-holder
-          = form_for(@project, url: transfer_project_path(@project), remote: true, html: { class: 'transfer-project' }) do |f|
+          = form_for(@project) do |f|
             .control-group
-              = f.label :namespace_id do
-                %span Namespace
+              = f.label :path do
+                %span Path
               .controls
                 .control-group
-                  = f.select :namespace_id, namespaces_options(@project.namespace_id), {prompt: 'Choose a project namespace'}, {class: 'chosen'}
+                  = f.text_field :path
                 %ul
-                  %li Be careful. Changing project namespace can have unintended side effects
-                  %li You can transfer project only to namespaces you can manage
+                  %li Be careful. Rename of project repo can have unintended side effects
                   %li You will need to update your local repositories to point to the new location.
             .form-actions
-              = f.submit 'Transfer', class: "btn btn-remove"
-    - else
-      %p.nothing_here_message Only project owner can transfer a project
-
-    .ui-box.ui-box-danger
-      .title Rename repository
-      .errors-holder
-      .form-holder
-        = form_for(@project) do |f|
-          .control-group
-            = f.label :path do
-              %span Path
-            .controls
-              .control-group
-                = f.text_field :path
-              %ul
-                %li Be careful. Rename of project repo can have unintended side effects
-                %li You will need to update your local repositories to point to the new location.
-          .form-actions
-            = f.submit 'Rename', class: "btn btn-remove"
-
-    - if can?(current_user, :remove_project, @project)
-      .ui-box.ui-box-danger
-        .title Remove project
-        .ui-box-body
-          %p
-            Remove of project will cause removing repository and all related resources like issues, merge requests etc.
-          %p
-            %strong Removed project can not be restored!
-
-          = link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove btn-small"
-    - else
-      %p.nothing_here_message Only project owner can remove a project
+              = f.submit 'Rename', class: "btn btn-remove"
+
+      - if can?(current_user, :remove_project, @project)
+        .ui-box.ui-box-danger
+          .title Remove project
+          .ui-box-body
+            %p
+              Remove of project will cause removing repository and all related resources like issues, merge requests etc.
+              %br
+              %strong Removed project can not be restored!
+
+            = link_to 'Remove project', @project, confirm: remove_project_message(@project), method: :delete, class: "btn btn-remove"
+      - else
+        %p.nothing_here_message Only project owner can remove a project
 
 .save-project-loader.hide
   %center