Put forms from expandable sections into fieldset to ensure proper animation

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 54 insertions, 51 deletions

diff --git a/app/views/admin/application_settings/_signin.html.haml b/app/views/admin/application_settings/_signin.html.haml
index e4e72a238ee..864e64b5fa9 100644
--- a/app/views/admin/application_settings/_signin.html.haml
+++ b/app/views/admin/application_settings/_signin.html.haml
@@ -1,56 +1,59 @@
 = form_for @application_setting, url: admin_application_settings_path, html: { class: 'form-horizontal fieldset-form' } do |f|
   = form_errors(@application_setting)
-  .form-group
-    .col-sm-offset-2.col-sm-10
-      .checkbox
-        = f.label :password_authentication_enabled_for_web do
-          = f.check_box :password_authentication_enabled_for_web
-          Password authentication enabled for web interface
-          .help-block
-            When disabled, an external authentication provider must be used.
-  .form-group
-    .col-sm-offset-2.col-sm-10
-      .checkbox
-        = f.label :password_authentication_enabled_for_git do
-          = f.check_box :password_authentication_enabled_for_git
-          Password authentication enabled for Git over HTTP(S)
-          .help-block
-            When disabled, a Personal Access Token
-            - if Gitlab::Auth::LDAP::Config.enabled?
-              or LDAP password
-            must be used to authenticate.
-  - if omniauth_enabled? && button_based_providers.any?
+
+  %fieldset
     .form-group
-      = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'control-label col-sm-2'
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :password_authentication_enabled_for_web do
+            = f.check_box :password_authentication_enabled_for_web
+            Password authentication enabled for web interface
+            .help-block
+              When disabled, an external authentication provider must be used.
+    .form-group
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :password_authentication_enabled_for_git do
+            = f.check_box :password_authentication_enabled_for_git
+            Password authentication enabled for Git over HTTP(S)
+            .help-block
+              When disabled, a Personal Access Token
+              - if Gitlab::Auth::LDAP::Config.enabled?
+                or LDAP password
+              must be used to authenticate.
+    - if omniauth_enabled? && button_based_providers.any?
+      .form-group
+        = f.label :enabled_oauth_sign_in_sources, 'Enabled OAuth sign-in sources', class: 'control-label col-sm-2'
+        .col-sm-10
+          .btn-group{ data: { toggle: 'buttons' } }
+            - oauth_providers_checkboxes.each do |source|
+              = source
+    .form-group
+      = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
+      .col-sm-10
+        .checkbox
+          = f.label :require_two_factor_authentication do
+            = f.check_box :require_two_factor_authentication
+            Require all users to setup Two-factor authentication
+    .form-group
+      = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0'
+        .help-block Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
+    .form-group
+      = f.label :home_page_url, 'Home page URL', class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block'
+        %span.help-block#home_help_block We will redirect non-logged in users to this page
+    .form-group
+      = f.label :after_sign_out_path, class: 'control-label col-sm-2'
+      .col-sm-10
+        = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block'
+        %span.help-block#after_sign_out_path_help_block We will redirect users to this page after they sign out
+    .form-group
+      = f.label :sign_in_text, class: 'control-label col-sm-2'
       .col-sm-10
-        .btn-group{ data: { toggle: 'buttons' } }
-          - oauth_providers_checkboxes.each do |source|
-            = source
-  .form-group
-    = f.label :two_factor_authentication, 'Two-factor authentication', class: 'control-label col-sm-2'
-    .col-sm-10
-      .checkbox
-        = f.label :require_two_factor_authentication do
-          = f.check_box :require_two_factor_authentication
-          Require all users to setup Two-factor authentication
-  .form-group
-    = f.label :two_factor_authentication, 'Two-factor grace period (hours)', class: 'control-label col-sm-2'
-    .col-sm-10
-      = f.number_field :two_factor_grace_period, min: 0, class: 'form-control', placeholder: '0'
-      .help-block Amount of time (in hours) that users are allowed to skip forced configuration of two-factor authentication
-  .form-group
-    = f.label :home_page_url, 'Home page URL', class: 'control-label col-sm-2'
-    .col-sm-10
-      = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'home_help_block'
-      %span.help-block#home_help_block We will redirect non-logged in users to this page
-  .form-group
-    = f.label :after_sign_out_path, class: 'control-label col-sm-2'
-    .col-sm-10
-      = f.text_field :after_sign_out_path, class: 'form-control', placeholder: 'http://company.example.com', :'aria-describedby' => 'after_sign_out_path_help_block'
-      %span.help-block#after_sign_out_path_help_block We will redirect users to this page after they sign out
-  .form-group
-    = f.label :sign_in_text, class: 'control-label col-sm-2'
-    .col-sm-10
-      = f.text_area :sign_in_text, class: 'form-control', rows: 4
-      .help-block Markdown enabled
+        = f.text_area :sign_in_text, class: 'form-control', rows: 4
+        .help-block Markdown enabled
+
   = f.submit 'Save changes', class: "btn btn-success"