Merge remote-tracking branch 'upstream/pull/5401'

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

diff --git a/app/helpers/svg_helper.rb b/app/helpers/svg_helper.rb
index ab9f890fed6136b290a4dc4468929882ec64eb17..b04ab1b0d56439a7b921c341bc2a4e731c365e12 100644 (file)
--- a/app/helpers/svg_helper.rb
+++ b/app/helpers/svg_helper.rb
@@ -1,4 +1,10 @@
 module SvgHelper
 module SvgHelper

+  def notice_svg_tag
+    path_data = "M 2 0 C 0.892 0 0 0.892 0 2 L 0 14 C 0 15.108 0.892 16 2 16 L 14 16 C 15.108 16 16 15.108 16 14 L 16 2 C 16 0.892 15.108 0 14 0 L 2 0 z M 7 3 L 9 3 L 9 8 L 7 8 L 7 3 z M 7 10 L 9 10 L 9 12 L 7 12 L 7 10 z"
+    path_tag = tag.path :d => path_data, :fill => "currentColor"
+    tag.svg path_tag, :width => 16, :height => 16
+  end
+

   def previous_page_svg_tag(**options)
     adjacent_page_svg_tag(dir == "rtl" ? 1 : -1, **options)
   end
   def previous_page_svg_tag(**options)
     adjacent_page_svg_tag(dir == "rtl" ? 1 : -1, **options)
   end


@@ -41,13 +47,16 @@ module SvgHelper
 
   # returns "<" shape if side == -1; ">" if side == 1
   def adjacent_page_svg_tag(side, **options)
 
   # returns "<" shape if side == -1; ">" if side == 1
   def adjacent_page_svg_tag(side, **options)

+    count = options[:count] || 1

     height = options[:height] || 15
     pad = 2
     segment = (0.5 * height) - pad
     height = options[:height] || 15
     pad = 2
     segment = (0.5 * height) - pad

-    width = (segment + (2 * pad)).ceil
-    path_data = "M#{side * (pad - (0.5 * width))},#{pad} l#{side * segment},#{segment} l#{-side * segment},#{segment}"
+    width = (segment + (2 * count * pad)).ceil
+    angled_line_data = "l#{side * segment},#{segment} l#{-side * segment},#{segment}"
+    path_data = Array.new(count) { |i| "M#{side * ((2 * i) + 1) * pad},#{pad} #{angled_line_data}" }.join(" ")

     path_tag = tag.path :d => path_data, :fill => "none", :stroke => "currentColor", :"stroke-width" => 1.5
     path_tag = tag.path :d => path_data, :fill => "none", :stroke => "currentColor", :"stroke-width" => 1.5

-    tag.svg path_tag, :width => width, :height => height, :viewBox => "-#{0.5 * width} 0 #{width} #{height}", :class => options[:class]
+    view_box = "#{-width} 0 #{width} #{height}" if side.negative?
+    tag.svg path_tag, :width => width, :height => height, :viewBox => view_box, :class => options[:class]

   end
 
   def stroke_attrs(attrs, prefix)
   end
 
   def stroke_attrs(attrs, prefix)