Merge pull request #3067 from evazion/fix-3065

Fix #3065: <div> id incorrect for certain controllers

app/helpers/artist_versions_helper.rb

@@ -1,7 +1,8 @@
 module ArtistVersionsHelper
   def artist_version_other_names_diff(artist_version)
     diff = artist_version.other_names_diff(artist_version.previous)
-    html = []
+    html = '<span class="diff-list">'
+
     diff[:added_names].each do |name|
       prefix = diff[:obsolete_added_names].include?(name) ? '<ins class="obsolete">' : '<ins>'
       html << prefix + h(name) + '</ins>'
@@ -13,12 +14,15 @@ module ArtistVersionsHelper
     diff[:unchanged_names].each do |name|
       html << '<span>' + h(name) + '</span>'
     end
-    return html.join(" ").html_safe
+
+    html << "</span>"
+    return html.html_safe
   end
 
   def artist_version_urls_diff(artist_version)
     diff = artist_version.urls_diff(artist_version.previous)
-    html = []
+    html = '<ul class="diff-list">'
+
     diff[:added_urls].each do |url|
       prefix = diff[:obsolete_added_urls].include?(url) ? '<ins class="obsolete">' : '<ins>'
       html << '<li>' + prefix + h(url) + '</ins></li>'
@@ -30,6 +34,8 @@ module ArtistVersionsHelper
     diff[:unchanged_urls].each do |url|
       html << '<li><span>' + h(url) + '</span></li>'
     end
-    return html.join(" ").html_safe
+
+    html << "</ul>"
+    html.html_safe
   end
 end

app/helpers/post_versions_helper.rb

@@ -1,7 +1,8 @@
 module PostVersionsHelper
   def post_version_diff(post_version)
     diff = post_version.diff(post_version.previous)
-    html = []
+    html = '<span class="diff-list">'
+
     diff[:added_tags].each do |tag|
       prefix = diff[:obsolete_added_tags].include?(tag) ? '+<ins class="obsolete">' : '<ins>+'
       html << prefix + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '</ins>'
@@ -13,6 +14,8 @@ module PostVersionsHelper
     diff[:unchanged_tags].each do |tag|
       html << '<span>' + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '</span>'
     end
-    return html.join(" ").html_safe
+
+    html << "</span>"
+    html.html_safe
   end
 end

app/helpers/upload_tags_report_helper.rb

@@ -1,12 +1,15 @@
 module UploadTagsReportHelper
   def diff_to_current(report)
-    html = []
+    html = '<span class="diff-list">'
+
     report.added_tags_array.each do |tag|
       html << '<ins>+' + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '</ins>'
     end
     report.removed_tags_array.each do |tag|
       html << '<del>-' + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '</del>'
     end
-    return html.join(" ").html_safe
+
+    html << "</span>"
+    html.html_safe
   end
 end

app/helpers/wiki_pages_helper.rb

@@ -18,7 +18,7 @@ module WikiPagesHelper
   end
 
   def wiki_page_other_names_list(wiki_page)
-    names_html = wiki_page.other_names_array.map{|name| link_to(name, "http://www.pixiv.net/search.php?s_mode=s_tag_full&word=#{u(name)}", :class => "other-name")}
+    names_html = wiki_page.other_names_array.map{|name| link_to(name, "http://www.pixiv.net/search.php?s_mode=s_tag_full&word=#{u(name)}", :class => "wiki-other-name")}
     names_html.join(" ").html_safe
   end
 end