Merge pull request #8304 from eduardoj/remove_bento_from_request_cont…

…roller

Replace Bento by Bootstrap for requests

src/api/app/views/webui/request/_delete_request_dialog.html.haml

@@ -1,21 +1,30 @@
-.dialog.darkgrey_box
-  .box.box-shadow
-    %h2.box-header Create Delete Request
-    .dialog-content
-      %p
-        Do you really want to request the deletion of #{project_or_package_link project: @project, package: @package}?
-      %p.smaller
-        = "You are about to send a request to the owner of the original #{ @package ? 'package' : 'project' }. Please describe your reasons to request the deletion of this #{ @package ? 'package' : 'project' }. The owner will be notified with the following details."
-
-      = form_tag({ action: :delete_request, project: @project }, method: :post) do
-        = hidden_field_tag(:package, @package) if defined? @package
-        %p
-          - if defined? @package
-            = label_tag(:target_project, 'In target project:')
-            %br/
-            = text_field_tag(:target_project, @project, size: 40, disabled: true)
-            %br/
-          = label_tag(:description, 'Please explain why:')
-          %br/
-          = text_area_tag(:description, '', size: '40x3', required: true)
-        = render partial: '/webui/shared/dialog_action_buttons'
+.modal.fade#delete-request-modal{ tabindex: -1, role: 'dialog', aria: { labelledby: 'delete-request-modal-label', hidden: true } }
+  .modal-dialog.modal-dialog-centered{ role: 'document' }
+    .modal-content
+      = form_tag(delete_request_path(project: project), method: :post) do
+        .modal-header
+          %h5.modal-title#delete-request-modal-label Create Delete Request
+        .modal-body
+          %p
+            -# FIXME: get rid of the helper project_or_package_link
+            :ruby
+              link = if defined?(package)
+                       project_or_package_link(project: project.name, package: package.name)
+                     else
+                       project_or_package_link(project: project.name)
+                     end
+            Do you really want to request the deletion of #{link}?
+          %p.font-italic
+            You are about to send a request to the owner of the original #{defined?(package) ? 'package' : 'project'}. Please describe your reasons to
+            request the deletion of this #{defined?(package) ? 'package' : 'project'}. The owner will be notified with the following details.
+          = hidden_field_tag(:package, package) if defined?(package)
+          %p
+            - if defined?(package)
+              .form-group
+                = label_tag(:target_project, 'In target project:')
+                = text_field_tag(:target_project, project, disabled: true, class: 'form-control')
+          .form-group
+            = label_tag(:description, 'Please explain why:')
+            = text_area_tag(:description, '', row: 3, class: 'form-control', required: true)
+        .modal-footer
+          = render partial: 'webui2/shared/dialog_action_buttons', locals: { submit_tag_text: 'Create' }

src/api/app/views/webui/request/_requests_small.html.haml

@@ -1,13 +1,16 @@
 - if requests.blank?
   %p No requests.
 - else
-  %table
-    %tbody
-      - requests.each do |req|
-        %tr
-          %td{ style: "border: medium none; padding: 0px;" }
-            = check_box_tag('supersede_request_numbers[]', req.number, false, id: "supersede_request_numbers#{req.number}")
+  %ul.list-unstyled
+    - requests.each_with_index do |req, _index|
+      %li
+        .custom-control.custom-checkbox
+          = check_box_tag('supersede_request_numbers[]', req.number, false,
+            id: "supersede_request_numbers#{req.number}", class: 'custom-control-input')
+          = label_tag("supersede_request_numbers#{req.number}", class: 'custom-control-label') do
             = link_to(req.number, controller: :request, action: :show, number: req.number)
             by
             = user_with_realname_and_icon(req.creator, short: true)
-            (#{fuzzy_time(req.created_at)})
+            = surround '(', ')' do
+              %u{ title: l(req.created_at.utc) }
+                #{time_ago_in_words(req.created_at)} ago