Merge branch 'issue-13113' into panel.sutty.nl

app/views/bootstrap/_custom_checkbox_for_field.haml

@@ -0,0 +1,6 @@
+- content = t("activerecord.attributes.#{field.object_name}.#{name}")
+- id = "#{field.object_name}_#{name}"
+- name = "#{field.object_name}[#{name}]"
+
+= render 'bootstrap/custom_checkbox', id: id, name: name, content: content, required: local_assigns[:required], value: "1" do
+  = yield

app/views/devise/sessions/new.haml

@@ -28,11 +28,8 @@
           placeholder: t('login.password')
       - if devise_mapping.rememberable?
         .form-group
-          = f.check_box :remember_me, aria: { describedby: 'remember-for' }
-          = f.label :remember_me
-          %small.form-text.text-muted#remember-for
-            = t('login.remember_me',
-              remember_for: distance_of_time_in_words(Usuarie.remember_for))
+          = render 'bootstrap/custom_checkbox_for_field', field: f, name: :remember_me do
+            = t('login.remember_me', remember_for: distance_of_time_in_words(Usuarie.remember_for))
       .actions
         = f.submit t('.sign_in'),
           class: 'btn btn-lg btn-block'