fix popover

hitobito · Oct 5, 2023 · c9a7b8c · c9a7b8c
1 parent 0ef7ebb
commit c9a7b8c
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 34 deletions.
diff --git a/app/views/events/courses/_buttons_youth.html.haml b/app/views/events/courses/_buttons_youth.html.haml
@@ -1,5 +1,4 @@
 = action_button(t('event.lists.bsv_export_button'),
-                '#',
+                nil,
                 :download,
-                title: t('event.lists.bsv_export_button'),
-                data: { toggle: 'popover', content: render('popover_bsv_export').to_str })
+                data: { bs_toggle: 'popover', bs_title: t('event.lists.bsv_export_button'), bs_content: render('popover_bsv_export').to_str })
diff --git a/app/views/events/courses/_popover_bsv_export.html.haml b/app/views/events/courses/_popover_bsv_export.html.haml
@@ -10,27 +10,18 @@
   = hidden_field_tag(:advanced, true) if defined?(advanced) && advanced
 
   = f.labeled(t('event.lists.popover_bsv_export.event_kinds'), help: 'f00') do
-    = select_tag('filter[kinds]', options_from_collection_for_select(Event::Kind.includes(:translations).without_deleted, :id, :label), multiple: true)
-    = f.help_block do
-      %span.muted= t('event.lists.popover_bsv_export.event_kinds_hint')
+    = select_tag('filter[kinds]', options_from_collection_for_select(Event::Kind.includes(:translations).without_deleted, :id, :label), multiple: true, class: 'form-select tom-select')
 
   = f.labeled(t('event.lists.popover_bsv_export.date_from')) do
-    .input-prepend{style: 'margin: 0 0.5rem 0.5rem 0'}
-      %span.add-on= icon(:'calendar-alt')
-      = text_field_tag('filter[bsv_since]', f(Date.today.beginning_of_year), class: 'date span2')
+    .input-group.w-50
+      .input-prepend
+        %span.input-group-text= icon(:'calendar-alt')
+      = text_field_tag('filter[bsv_since]', f(Date.today.beginning_of_year), class: 'date form-control form-control-sm')
 
   = f.labeled(t('event.lists.popover_bsv_export.date_to')) do
-    .input-prepend{style: 'margin: 0 0.5rem 0.5rem 0'}
-      %span.add-on= icon(:'calendar-alt')
-      = text_field_tag('filter[bsv_until]', f(Date.today.end_of_year), class: 'date span2')
+    .input-group.w-50
+      .input-prepend
+        %span.input-group-text= icon(:'calendar-alt')
+      = text_field_tag('filter[bsv_until]', f(Date.today.end_of_year), class: 'date form-control form-control-sm')
 
   = form_buttons(f, submit_label: t('event.lists.bsv_export_button'), cancel_url: :list_courses)
-
-:javascript
-  (function() {
-    $('body').on('click', '.popover :submit', function(e) {
-      return setTimeout((function() {
-        return $('a[data-toggle=popover]').popover('hide');
-      }), 100);
-    });
-  });
diff --git a/app/views/people/manageds/_fields.html.haml b/app/views/people/manageds/_fields.html.haml
@@ -1,11 +1,11 @@
-- #  Copyright (c) 2023, CEVI Schweiz, Pfadibewegung Schweiz,
-- #  Jungwacht Blauring Schweiz, Pro Natura, Stiftung für junge Auslandschweizer.
-- #  This file is part of hitobito_youth and licensed under the Affero General Public License version 3
-- #  or later. See the COPYING file at the top-level directory or at
-- #  https://github.com/hitobito/hitobito_youth.
+-#  Copyright (c) 2023, CEVI Schweiz, Pfadibewegung Schweiz,
+-#  Jungwacht Blauring Schweiz, Pro Natura, Stiftung für junge Auslandschweizer.
+-#  This file is part of hitobito_youth and licensed under the Affero General Public License version 3
+-#  or later. See the COPYING file at the top-level directory or at
+-#  https://github.com/hitobito/hitobito_youth.
 
 - if f.object.new_record?
   = f.person_field(:managed, { data: { url: query_people_path(limit_by_permission: :change_managers) } })
 - else
-  .span4
-    = f.object.managed.full_name
+  .col-4
+    = f.object.managed.full_name
diff --git a/app/views/people/managers/_fields.html.haml b/app/views/people/managers/_fields.html.haml
@@ -1,11 +1,11 @@
-- #  Copyright (c) 2023, CEVI Schweiz, Pfadibewegung Schweiz,
-- #  Jungwacht Blauring Schweiz, Pro Natura, Stiftung für junge Auslandschweizer.
-- #  This file is part of hitobito_youth and licensed under the Affero General Public License version 3
-- #  or later. See the COPYING file at the top-level directory or at
-- #  https://github.com/hitobito/hitobito_youth.
+-#  Copyright (c) 2023, CEVI Schweiz, Pfadibewegung Schweiz,
+-#  Jungwacht Blauring Schweiz, Pro Natura, Stiftung für junge Auslandschweizer.
+-#  This file is part of hitobito_youth and licensed under the Affero General Public License version 3
+-#  or later. See the COPYING file at the top-level directory or at
+-#  https://github.com/hitobito/hitobito_youth.
 
 - if f.object.new_record?
   = f.person_field(:manager)
 - else
-  .span4
+  .col-4
     = f.object.manager.full_name