Merge pull request #4988 from nenad-vujicic/issue_4912_pr_labeling

[rails.git] / app / helpers / browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 4cd0384cbde611fda7e0a44d77ef22381b5b3740..69a8f8fa2e57eb5b76a717f98506c5f4752c33da 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -44,9 +44,9 @@ module BrowseHelper
     t "printable_name.version", :version => object.version
   end
 
     t "printable_name.version", :version => object.version
   end
 

-  def element_strikethrough(object, &block)
+  def element_strikethrough(object, &)

     if object.redacted? || !object.visible?
     if object.redacted? || !object.visible?

-      tag.s(&block)
+      tag.s(&)

     else
       yield
     end
     else
       yield
     end


@@ -86,17 +86,17 @@ module BrowseHelper
     max_width_for_default_padding = 35
 
     width = 0
     max_width_for_default_padding = 35
 
     width = 0

-    pagination_items(pages, {}).each do |body|
+    pagination_items(pages, {}).each do |(body)|

       width += 2 # padding width
       width += body.length
     end
     link_classes = ["page-link", { "px-1" => width > max_width_for_default_padding }]
 
       width += 2 # padding width
       width += body.length
     end
     link_classes = ["page-link", { "px-1" => width > max_width_for_default_padding }]
 

-    tag.ul :class => "pagination pagination-sm mb-1 ms-auto" do
+    tag.ul :class => "pagination pagination-sm mb-2" do

       pagination_items(pages, {}).each do |body, page_or_class|
         linked = !(page_or_class.is_a? String)
         link = if linked
       pagination_items(pages, {}).each do |body, page_or_class|
         linked = !(page_or_class.is_a? String)
         link = if linked

-                 link_to body, url_for(page_param => page_or_class.number), :class => link_classes, :title => yield(page_or_class)
+                 link_to body, url_for(page_param => page_or_class.number), :class => link_classes, **yield(page_or_class)

                else
                  tag.span body, :class => link_classes
                end
                else
                  tag.span body, :class => link_classes
                end