1 files changed, 71 insertions, 3 deletions
diff --git a/app/views/admin/application_settings/show.html.haml b/app/views/admin/application_settings/show.html.haml
index ecc46d86afe..7aa4130e574 100644
--- a/app/views/admin/application_settings/show.html.haml
+++ b/app/views/admin/application_settings/show.html.haml
@@ -1,5 +1,73 @@
+- breadcrumb_title "Settings"
 - page_title "Settings"
+- @content_class = "limit-container-width" unless fluid_layout
+- expanded = Rails.env.test?
 
-%h3.page-title Settings
-%hr
-= render 'form'
+%section.settings.as-visibility-access.no-animate{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      Visibility and access controls
+    %button.btn.js-settings-toggle
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      Set default and restrict visibility levels. Configure import sources and git access protocol.
+  .settings-content
+    = render 'visibility_and_access'
+
+%section.settings.as-account-limit.no-animate{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      Account and limit settings
+    %button.btn.js-settings-toggle
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      Session expiration, projects limit and attachment size.
+  .settings-content
+    = render 'account_and_limit'
+
+%section.settings.as-signup.no-animate{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      Sign-up restrictions
+    %button.btn.js-settings-toggle
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      Configure the way a user creates a new account.
+  .settings-content
+    = render 'signup'
+
+%section.settings.as-signin.no-animate{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      Sign-in restrictions
+    %button.btn.js-settings-toggle
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      Set requirements for a user to sign-in. Enable mandatory two-factor authentication.
+  .settings-content
+    = render 'signin'
+
+%section.settings.as-help-page.no-animate{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      Help page
+    %button.btn.js-settings-toggle
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      Help page text and support page url.
+  .settings-content
+    = render 'help_page'
+
+%section.settings.as-pages.no-animate{ class: ('expanded' if expanded) }
+  .settings-header
+    %h4
+      Pages
+    %button.btn.js-settings-toggle
+      = expanded ? 'Collapse' : 'Expand'
+    %p
+      Size and domain settings for static websites
+  .settings-content
+    = render 'pages'
+
+.prepend-top-20
+  = render 'form'