diff --git a/app/assets/stylesheets/common/diffs.scss b/app/assets/stylesheets/common/diffs.scss new file mode 100644 index 000000000..87f956303 --- /dev/null +++ b/app/assets/stylesheets/common/diffs.scss @@ -0,0 +1,21 @@ +.diff-list { + ins, ins a { + color: green; + text-decoration: none; + margin-right: 0.5em; + } + + ins.obsolete, ins.obsolete a { + color: darkGreen; + } + + del, del a { + color: red; + text-decoration: line-through; + margin-right: 0.5em; + } + + del.obsolete, del.obsolete a { + color: darkRed; + } +} diff --git a/app/assets/stylesheets/specific/post_versions.scss b/app/assets/stylesheets/specific/post_versions.scss new file mode 100644 index 000000000..03c505847 --- /dev/null +++ b/app/assets/stylesheets/specific/post_versions.scss @@ -0,0 +1,9 @@ +@import "../common/000_vars.scss"; + +div#c-post-versions { + div#a-index { + tr.hilite { + background: $highlight_color; + } + } +} diff --git a/app/assets/stylesheets/specific/posts.scss b/app/assets/stylesheets/specific/posts.scss index ae118f21d..2faf90ebf 100644 --- a/app/assets/stylesheets/specific/posts.scss +++ b/app/assets/stylesheets/specific/posts.scss @@ -482,30 +482,6 @@ div#c-post-versions, div#c-artist-versions { a { word-wrap: break-word } - - tr.hilite { - background: $highlight_color; - } - - ins, ins a { - color: green; - text-decoration: none; - margin-right: 0.5em; - } - - ins.obsolete, ins.obsolete a { - color: darkGreen; - } - - del, del a { - color: red; - text-decoration: line-through; - margin-right: 0.5em; - } - - del.obsolete, del.obsolete a { - color: darkRed; - } } } diff --git a/app/helpers/artist_versions_helper.rb b/app/helpers/artist_versions_helper.rb index 8947cd0c3..fd641d80e 100644 --- a/app/helpers/artist_versions_helper.rb +++ b/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 = '' + diff[:added_names].each do |name| prefix = diff[:obsolete_added_names].include?(name) ? '' : '' html << prefix + h(name) + '' @@ -13,12 +14,15 @@ module ArtistVersionsHelper diff[:unchanged_names].each do |name| html << '' + h(name) + '' end - return html.join(" ").html_safe + + html << "" + return html.html_safe end def artist_version_urls_diff(artist_version) diff = artist_version.urls_diff(artist_version.previous) - html = [] + html = '" + html.html_safe end end diff --git a/app/helpers/post_versions_helper.rb b/app/helpers/post_versions_helper.rb index a344ed09c..f24545025 100644 --- a/app/helpers/post_versions_helper.rb +++ b/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 = '' + diff[:added_tags].each do |tag| prefix = diff[:obsolete_added_tags].include?(tag) ? '+' : '+' html << prefix + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '' @@ -13,6 +14,8 @@ module PostVersionsHelper diff[:unchanged_tags].each do |tag| html << '' + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '' end - return html.join(" ").html_safe + + html << "" + html.html_safe end end diff --git a/app/helpers/upload_tags_report_helper.rb b/app/helpers/upload_tags_report_helper.rb index f7a997853..76ef3f3b2 100644 --- a/app/helpers/upload_tags_report_helper.rb +++ b/app/helpers/upload_tags_report_helper.rb @@ -1,12 +1,15 @@ module UploadTagsReportHelper def diff_to_current(report) - html = [] + html = '' + report.added_tags_array.each do |tag| html << '+' + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '' end report.removed_tags_array.each do |tag| html << '-' + link_to(wordbreakify(tag), posts_path(:tags => tag)) + '' end - return html.join(" ").html_safe + + html << "" + html.html_safe end end diff --git a/app/views/artist_versions/index.html.erb b/app/views/artist_versions/index.html.erb index c49e8559e..9b47309c0 100644 --- a/app/views/artist_versions/index.html.erb +++ b/app/views/artist_versions/index.html.erb @@ -42,7 +42,7 @@ <% end %> <%= artist_version.is_active? %> <% if artist_version.visible? %> - + <%= artist_version_urls_diff(artist_version) %> <% else %> <% end %>