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_events.scss b/app/assets/stylesheets/specific/post_events.scss new file mode 100644 index 000000000..10fabfc64 --- /dev/null +++ b/app/assets/stylesheets/specific/post_events.scss @@ -0,0 +1,11 @@ +div#c-post-events { + #a-index { + tr.resolved-true { + background: #DDD; + } + + tr.resolved-false { + background: #FFF; + } + } +} 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 7262166b5..b5cfe764c 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/assets/stylesheets/specific/terms_of_service.scss b/app/assets/stylesheets/specific/terms_of_service.scss index 42426c348..9a2a7be4d 100644 --- a/app/assets/stylesheets/specific/terms_of_service.scss +++ b/app/assets/stylesheets/specific/terms_of_service.scss @@ -1,6 +1,6 @@ @import "../common/000_vars.scss"; -div#terms-of-service { +div#c-static div#a-terms-of-service { width: 40em; h1 { diff --git a/app/assets/stylesheets/specific/user_upgrades.scss b/app/assets/stylesheets/specific/user_upgrades.scss new file mode 100644 index 000000000..34ddc1e02 --- /dev/null +++ b/app/assets/stylesheets/specific/user_upgrades.scss @@ -0,0 +1,56 @@ +div#c-user-upgrades { + div#a-new { + max-width: 40em; + font-size: 1.2em; + + form.stripe { + display: inline; + } + + div.section { + margin-bottom: 2em; + } + + div#feature-comparison { + overflow: hidden; + margin-bottom: 1em; + + table { + width: 100%; + + colgroup { + width: 10em; + } + + colgroup#basic { + } + + colgroup#gold { + background-color: #FFF380; + } + + colgroup#platinum { + background-color: #eee; + } + + td, th { + text-align: center; + vertical-align: top; + padding: 0.5em 0; + } + + tbody { + tr:hover { + background-color: #FEF; + } + } + + p.cost-footnote { + font-size: 80%; + color: gray; + margin: 0; + } + } + } + } +} diff --git a/app/assets/stylesheets/specific/users.scss b/app/assets/stylesheets/specific/users.scss index 87b3b8533..eeea777a1 100644 --- a/app/assets/stylesheets/specific/users.scss +++ b/app/assets/stylesheets/specific/users.scss @@ -86,59 +86,4 @@ div#c-users { margin-bottom: 2em; } } - - div#a-upgrade-information { - max-width: 40em; - font-size: 1.2em; - - form.stripe { - display: inline; - } - - div.section { - margin-bottom: 2em; - } - - div#feature-comparison { - overflow: hidden; - margin-bottom: 1em; - - table { - width: 100%; - - colgroup { - width: 10em; - } - - colgroup#basic { - } - - colgroup#gold { - background-color: #FFF380; - } - - colgroup#platinum { - background-color: #eee; - } - - td, th { - text-align: center; - vertical-align: top; - padding: 0.5em 0; - } - - tbody { - tr:hover { - background-color: #FEF; - } - } - - p.cost-footnote { - font-size: 80%; - color: gray; - margin: 0; - } - } - } - } } diff --git a/app/assets/stylesheets/specific/wiki_page_versions.scss b/app/assets/stylesheets/specific/wiki_page_versions.scss new file mode 100644 index 000000000..74f3cee8c --- /dev/null +++ b/app/assets/stylesheets/specific/wiki_page_versions.scss @@ -0,0 +1,25 @@ +div#c-wiki-page-versions { + #a-diff { + del { + background: #FCC; + text-decoration: none; + } + + ins { + background: #CFC; + text-decoration: none; + } + } + + #a-index { + table { + margin-bottom: 1em; + } + } + + #a-show { + span.version { + color: #AAA; + } + } +} diff --git a/app/assets/stylesheets/specific/wiki_pages.scss b/app/assets/stylesheets/specific/wiki_pages.scss index a4662af4d..20ff2c680 100644 --- a/app/assets/stylesheets/specific/wiki_pages.scss +++ b/app/assets/stylesheets/specific/wiki_pages.scss @@ -1,40 +1,19 @@ -div#c-wiki-pages, div#excerpt { - span.version { - color: #AAA; - } - - div.notice { - font-size: 0.8em; - padding: 1em; - margin: 1em 0; - } - - del { - background: #FCC; - text-decoration: none; - } - - ins { - background: #CFC; - text-decoration: none; - } - - table { - margin-bottom: 1em; - } - - #content { - margin-left: 15em; - padding-left: 1em; - } - - .hint { +div#c-wiki-pages { + form span.hint { display: block; } - .other-name { - background-color: #EEE; - padding: 3px; - border-radius: 3px; + #a-new { + div.notice { + font-size: 0.8em; + padding: 1em; + margin: 1em 0; + } } } + +.wiki-other-name { + background-color: #EEE; + padding: 3px; + border-radius: 3px; +} diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 039f2c662..d501df51f 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,6 +1,6 @@ class UsersController < ApplicationController respond_to :html, :xml, :json - before_filter :member_only, :only => [:edit, :update, :upgrade] + before_filter :member_only, :only => [:edit, :update] skip_before_filter :api_check def new 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/helpers/wiki_pages_helper.rb b/app/helpers/wiki_pages_helper.rb index 3e55ee9d9..b41b9aa66 100644 --- a/app/helpers/wiki_pages_helper.rb +++ b/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 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 %> diff --git a/app/views/bans/new.html.erb b/app/views/bans/new.html.erb index 5f22a3a6b..5f424706e 100644 --- a/app/views/bans/new.html.erb +++ b/app/views/bans/new.html.erb @@ -1,5 +1,5 @@ -
-
+
+

New Ban

<%= render "form", :ban => @ban %>
diff --git a/app/views/explore/posts/missed_searches.html.erb b/app/views/explore/posts/missed_searches.html.erb index c74349eaf..b676aa125 100644 --- a/app/views/explore/posts/missed_searches.html.erb +++ b/app/views/explore/posts/missed_searches.html.erb @@ -1,5 +1,5 @@
-
+

Missed Searches (past seven days)

diff --git a/app/views/explore/posts/popular.html.erb b/app/views/explore/posts/popular.html.erb index 101fa020d..61b858860 100644 --- a/app/views/explore/posts/popular.html.erb +++ b/app/views/explore/posts/popular.html.erb @@ -1,5 +1,5 @@
-
+
diff --git a/app/views/moderator/ip_addrs/index.html.erb b/app/views/moderator/ip_addrs/index.html.erb index bca873222..29b1df8cb 100644 --- a/app/views/moderator/ip_addrs/index.html.erb +++ b/app/views/moderator/ip_addrs/index.html.erb @@ -3,9 +3,13 @@

IP Addresses

<% if params[:search][:user_id].present? || params[:search][:user_name].present? %> - <%= render "ip_listing" %> +
+ <%= render "ip_listing" %> +
<% else %> - <%= render "user_listing" %> +
+ <%= render "user_listing" %> +
<% end %> diff --git a/app/views/pool_versions/diff.html.erb b/app/views/pool_versions/diff.html.erb index c0ab1e2ee..895091345 100644 --- a/app/views/pool_versions/diff.html.erb +++ b/app/views/pool_versions/diff.html.erb @@ -1,4 +1,4 @@ -
+

Pool Version Comparison: <%= @pool_version.name %>

diff --git a/app/views/pool_versions/index.html.erb b/app/views/pool_versions/index.html.erb index ddca76a92..9a6242899 100644 --- a/app/views/pool_versions/index.html.erb +++ b/app/views/pool_versions/index.html.erb @@ -1,4 +1,4 @@ -
+

Pool History

diff --git a/app/views/post_events/index.html.erb b/app/views/post_events/index.html.erb index 16db81948..b4a97d6ff 100644 --- a/app/views/post_events/index.html.erb +++ b/app/views/post_events/index.html.erb @@ -1,4 +1,4 @@ -
+

Flags & Appeals

diff --git a/app/views/reports/upload_tags.html.erb b/app/views/reports/upload_tags.html.erb index 1b250c158..0dd2e4bb1 100644 --- a/app/views/reports/upload_tags.html.erb +++ b/app/views/reports/upload_tags.html.erb @@ -1,5 +1,5 @@ -
-
+
+

Upload tag changes report for <%= @user.pretty_name %>

diff --git a/app/views/static/terms_of_service.html.erb b/app/views/static/terms_of_service.html.erb index b6f0337c7..e542ef99c 100644 --- a/app/views/static/terms_of_service.html.erb +++ b/app/views/static/terms_of_service.html.erb @@ -1,5 +1,5 @@ -
-
+
+

Rules

Please read the following before using the site:

diff --git a/app/views/user_reverts/new.html.erb b/app/views/user_reverts/new.html.erb index 265560da1..d8be6a3ee 100644 --- a/app/views/user_reverts/new.html.erb +++ b/app/views/user_reverts/new.html.erb @@ -1,4 +1,4 @@ -
+

Revert Changes

diff --git a/app/views/user_upgrades/new.html.erb b/app/views/user_upgrades/new.html.erb index b2a7c41d1..85b4639b0 100644 --- a/app/views/user_upgrades/new.html.erb +++ b/app/views/user_upgrades/new.html.erb @@ -1,5 +1,5 @@ -
-
+
+

Upgrade Account

<% unless params[:user_id] %> diff --git a/app/views/user_upgrades/show.html.erb b/app/views/user_upgrades/show.html.erb index 9c691f7f7..e4046b87e 100644 --- a/app/views/user_upgrades/show.html.erb +++ b/app/views/user_upgrades/show.html.erb @@ -1,5 +1,5 @@ -
-
+
+
<% if flash[:success] %>

Congradulations!

diff --git a/app/views/users/upgrade_information.html.erb b/app/views/users/upgrade_information.html.erb deleted file mode 100644 index f4ca556b6..000000000 --- a/app/views/users/upgrade_information.html.erb +++ /dev/null @@ -1,102 +0,0 @@ -
-
-

Upgrade Your Account

- -

Want more searching power? Upgrade your account and become a power user of the best database of anime artwork on the internet.

- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <% if SavedSearch.enabled? %> - - - - - - - <% end %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
BasicGoldPlatinum
CostFree$20

One time fee

$40

One time fee

Tag Limit2612
Favorite Limit10,00020,000Unlimited
Page Limit1,0002,0005,000
Saved SearchesNoYesYes
See Censored TagsNoYesYes
API Hourly Limit3,00010,00020,000
Database Timeout3 sec6 sec9 sec
Variable Posts Per PageNoYesYes
Name ChangesNoYesYes
-
-

Upgrading from Gold to Platinum will only cost $20. If you have any further questions or concerns, feel free to contact me at <%= mail_to Danbooru.config.contact_email, nil, :encode => :javascript %>.

- - <% if CurrentUser.user.level < User::Levels::GOLD %> - <%= stripe_button("Upgrade to Gold", 2000) %> - <%= stripe_button("Upgrade to Platinum", 4000) %> - <% elsif CurrentUser.user.level < User::Levels::PLATINUM %> - <%= stripe_button("Upgrade Gold to Platinum", 2000) %> - <% end %> -
-
- -<%= render "secondary_links" %> - -<% content_for(:page_title) do %> - Upgrade - <%= Danbooru.config.app_name %> -<% end %> diff --git a/app/views/wiki_page_versions/_global_listing.html.erb b/app/views/wiki_page_versions/_global_listing.html.erb new file mode 100644 index 000000000..884868429 --- /dev/null +++ b/app/views/wiki_page_versions/_global_listing.html.erb @@ -0,0 +1,38 @@ +
+ + + + + + + <% if CurrentUser.is_moderator? %> + + <% end %> + + + + + <% @wiki_page_versions.each do |wiki_page_version| %> + + + + + <% if CurrentUser.is_moderator? %> + + <% end %> + + + <% end %> + +
TitleDelIP AddressLast edited
+ <%= link_to wiki_page_version.title, wiki_page_version_path(wiki_page_version) %> + <%= wiki_page_version.is_deleted? ? "Y" : "" %><%= link_to "wiki", wiki_page_path(wiki_page_version.wiki_page_id) %> + <%= link_to_ip wiki_page_version.updater_ip_addr %> + + <%= compact_time(wiki_page_version.updated_at) %> + <% if wiki_page_version.updater %> + by + <%= link_to_user wiki_page_version.updater %> + <% end %> +
+
diff --git a/app/views/wiki_page_versions/_page_listing.html.erb b/app/views/wiki_page_versions/_page_listing.html.erb new file mode 100644 index 000000000..332286a81 --- /dev/null +++ b/app/views/wiki_page_versions/_page_listing.html.erb @@ -0,0 +1,56 @@ +
+ <%= form_tag(diff_wiki_page_versions_path, :method => :get) do %> + + + + + + + + + + + <% if CurrentUser.is_moderator? %> + + <% end %> + + + + + <% @wiki_page_versions.each_with_index do |wiki_page_version, i| %> + + + + + + + + + <% if CurrentUser.is_moderator? %> + + <% end %> + + + <% end %> + +
TitleDelIP AddressLast edited
+ <% if i < @wiki_page_versions.length - 1 %> + <%= link_to "diff", diff_wiki_page_versions_path(:otherpage => wiki_page_version.id, :thispage => @wiki_page_versions[i + 1].id) %> + <% else %> + diff + <% end %> + <%= radio_button_tag "thispage", wiki_page_version.id, (i == 1) %><%= radio_button_tag "otherpage", wiki_page_version.id, (i == 0) %> + <%= link_to wiki_page_version.title, wiki_page_version_path(wiki_page_version) %> + <%= wiki_page_version.is_deleted? ? "Y" : "" %><%= link_to "wiki", wiki_page_path(wiki_page_version.wiki_page_id) %> + <%= link_to_ip wiki_page_version.updater_ip_addr %> + + <%= compact_time(wiki_page_version.updated_at) %> + <% if wiki_page_version.updater %> + by + <%= link_to_user wiki_page_version.updater %> + <% end %> +
+ + <%= submit_tag "Diff" %> + <% end %> +
diff --git a/app/views/wiki_page_versions/diff.html.erb b/app/views/wiki_page_versions/diff.html.erb index 95ad20249..bb5f9b5eb 100644 --- a/app/views/wiki_page_versions/diff.html.erb +++ b/app/views/wiki_page_versions/diff.html.erb @@ -1,4 +1,4 @@ -
+

Wiki Page: <%= @thispage.title %>

diff --git a/app/views/wiki_page_versions/index.html.erb b/app/views/wiki_page_versions/index.html.erb index 18f87bbd5..f28821b7a 100644 --- a/app/views/wiki_page_versions/index.html.erb +++ b/app/views/wiki_page_versions/index.html.erb @@ -1,77 +1,14 @@ -
+
<%= render "wiki_pages/sidebar" %>

Wiki Pages

- <%= form_tag(diff_wiki_page_versions_path, :method => :get) do %> - - - - <% if params[:search] && params[:search][:wiki_page_id] && @wiki_page_versions.length > 1 %> - - - - <% end %> - - - - <% if CurrentUser.is_moderator? %> - - <% end %> - - - - - <% @wiki_page_versions.each_with_index do |wiki_page_version, i| %> - - <% if params[:search] && params[:search][:wiki_page_id] && @wiki_page_versions.length > 1 %> - - - - <% end %> - - - - <% if CurrentUser.is_moderator? %> - - <% end %> - - - <% end %> - -
TitleDelIP AddressLast edited
- <% if i < @wiki_page_versions.length - 1 %> - <%= link_to "diff", diff_wiki_page_versions_path(:otherpage => wiki_page_version.id, :thispage => @wiki_page_versions[i + 1].id) %> - <% else %> - diff - <% end %> - - <% if i == 1 %> - <%= radio_button_tag "thispage", wiki_page_version.id, :checked => true %> - <% else %> - <%= radio_button_tag "thispage", wiki_page_version.id %> - <% end %> - - <% if i == 0 %> - <%= radio_button_tag "otherpage", wiki_page_version.id, :checked => true %> - <% else %> - <%= radio_button_tag "otherpage", wiki_page_version.id %> - <% end %> - <%= link_to wiki_page_version.title, wiki_page_version_path(wiki_page_version) %><%= wiki_page_version.is_deleted? ? "Y" : "" %><%= link_to "wiki", wiki_page_path(wiki_page_version.wiki_page_id) %> - <%= link_to_ip wiki_page_version.updater_ip_addr %> - - <%= compact_time(wiki_page_version.updated_at) %> - <% if wiki_page_version.updater %> - by - <%= link_to_user wiki_page_version.updater %> - <% end %> -
- - <% if params[:search] && params[:search][:wiki_page_id] %> - <%= submit_tag "Diff" %> - <% end %> + <% if params.dig(:search, :wiki_page_id).present? %> + <%= render "page_listing" %> + <% else %> + <%= render "global_listing" %> <% end %> <%= numbered_paginator(@wiki_page_versions) %> diff --git a/app/views/wiki_page_versions/show.html.erb b/app/views/wiki_page_versions/show.html.erb index ecfd85b86..dcdfa1ce3 100644 --- a/app/views/wiki_page_versions/show.html.erb +++ b/app/views/wiki_page_versions/show.html.erb @@ -1,4 +1,4 @@ -
+
<%= render "wiki_pages/sidebar" %>