Add bootstrap view for notifications view

openSUSE · Feb 26, 2019 · d85ebdd · d85ebdd
1 parent 8420f42
commit d85ebdd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/src/api/app/controllers/webui/subscriptions_controller.rb b/src/api/app/controllers/webui/subscriptions_controller.rb
@@ -10,7 +10,7 @@ def index
 
   def update
     subscriptions_form.update!(params[:subscriptions])
-    flash[:notice] = 'Notifications settings updated'
+    flash[:success] = 'Notifications settings updated'
   rescue ActiveRecord::RecordInvalid
     flash[:error] = 'Notifications settings could not be updated due to an error'
   ensure

diff --git a/src/api/app/views/webui2/webui/subscriptions/_subscriptions_form.html.haml b/src/api/app/views/webui2/webui/subscriptions/_subscriptions_form.html.haml
@@ -1,16 +1,17 @@
-:ruby
-  i = 0
-
+- i = 0
 - @subscriptions_form.subscriptions_by_event.each do |event_class, subscriptions|
-  %li.list-group-item
-    %h5= event_class.description
-    %p= Event::Base::EXPLANATION_FOR_NOTIFICATIONS[event_class.to_s]
-    - subscriptions.each do |subscription|
-      = fields_for "subscriptions[#{i}]", subscription do |f|
-        .custom-control.custom-checkbox.custom-control-inline
-          = f.check_box :channel, { class: 'custom-control-input', data: { eventtype: subscription.eventtype,
-          receiver_role: subscription.receiver_role } }, EventSubscription.channels.keys[1], EventSubscription.channels.keys[0]
-          = f.label :channel, EventSubscription::RECEIVER_ROLE_TEXTS[subscription.receiver_role], class: 'custom-control-label'
-          = f.hidden_field :eventtype
-          = f.hidden_field :receiver_role
-          - i += 1
+  .card.bg-light.mb-2
+    .card-body
+      %h5.card-title= event_class.description
+      %p.card-text= Event::Base::EXPLANATION_FOR_NOTIFICATIONS[event_class.to_s]
+      .form-inline
+        - subscriptions.each do |subscription|
+          = fields_for "subscriptions[#{i}]", subscription do |f|
+            .form-group.custom-control.custom-checkbox.mr-3
+              = f.check_box :channel, { class: 'custom-control-input',
+                data: { eventtype: subscription.eventtype, receiver_role: subscription.receiver_role } },
+                EventSubscription.channels.keys[1], EventSubscription.channels.keys[0]
+              = f.label :channel, EventSubscription::RECEIVER_ROLE_TEXTS[subscription.receiver_role], class: 'custom-control-label'
+              = f.hidden_field :eventtype
+              = f.hidden_field :receiver_role
+            - i += 1
diff --git a/src/api/app/views/webui2/webui/subscriptions/index.html.haml b/src/api/app/views/webui2/webui/subscriptions/index.html.haml
@@ -4,3 +4,10 @@
 .card.mb-3
   = render partial: 'webui/configuration/tabs'
   .card-body
+    %h3.card-title
+      Events
+    %p.card-text
+      Choose default notification settings for events (checked means direct email).
+      = form_tag(notifications_path, method: :put, id: 'notification_form') do
+        = render partial: 'subscriptions_form'
+        %p= submit_tag 'Update'