Merge branch 'master' of github.com:r888888888/danbooru

app/assets/stylesheets/specific/comments.css.scss

@@ -62,7 +62,7 @@ div.comments-for-post {
 }
 
 div#c-comments {
-  div#a-index {
+  div#a-index, div#a-show {
     div.header {
       span.info {
         margin-right: 1.5em;

app/assets/stylesheets/specific/posts.css.scss

@@ -302,11 +302,19 @@ div#c-post-versions, div#c-artist-versions {
       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;
+    }
   }
 }
 

app/helpers/post_versions_helper.rb

@@ -5,9 +5,15 @@ module PostVersionsHelper
     diff[:added_tags].each do |tag|
       html << '<ins>+' + link_to(tag, posts_path(:tags => tag)) + '</ins>'
     end
+    diff[:obsolete_added_tags].each do |tag|
+      html << '+<ins class="obsolete">' + link_to(tag, posts_path(:tags => tag)) + '</ins>'
+    end
     diff[:removed_tags].each do |tag|
       html << '<del>-' + link_to(tag, posts_path(:tags => tag)) + '</del>'
     end
+    diff[:obsolete_removed_tags].each do |tag|
+      html << '-<del class="obsolete">' + link_to(tag, posts_path(:tags => tag)) + '</del>'
+    end
     diff[:unchanged_tags].each do |tag|
       html << '<span>' + link_to(tag, posts_path(:tags => tag)) + '</span>'
     end

app/models/post_version.rb

@@ -84,12 +84,15 @@ class PostVersion < ActiveRecord::Base
       old_tags << "source:#{version.source}" if version.source.present?
     end
 
+    added_tags = new_tags - old_tags
+    removed_tags = old_tags - new_tags
+
     return {
-      :added_tags => new_tags - old_tags,
+      :added_tags => added_tags & latest_tags,
-      :removed_tags => old_tags - new_tags,
+      :removed_tags => removed_tags - latest_tags,
+      :obsolete_added_tags => added_tags - latest_tags,
+      :obsolete_removed_tags => removed_tags & latest_tags,
       :unchanged_tags => new_tags & old_tags,
-      :obsolete_added_tags => new_tags - latest_tags,
-      :obsolete_removed_tags => old_tags & latest_tags,
     }
   end
 

app/models/tag.rb

@@ -1,5 +1,5 @@
 class Tag < ActiveRecord::Base
-  METATAGS = "-user|user|-approver|approver|commenter|comm|noter|-pool|pool|-fav|fav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|score|filesize|source|id|date|order|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|pixiv_id"
+  METATAGS = "-user|user|-approver|approver|commenter|comm|noter|-pool|pool|-fav|fav|sub|md5|-rating|rating|-locked|locked|width|height|mpixels|score|filesize|source|id|date|order|-status|status|tagcount|gentags|arttags|chartags|copytags|parent|pixiv_id|pixiv"
   attr_accessible :category
   has_one :wiki_page, :foreign_key => "name", :primary_key => "title"
 
@@ -268,27 +268,29 @@ class Tag < ActiveRecord::Base
           case $1
           when "-user"
             q[:uploader_id_neg] ||= []
-            q[:uploader_id_neg] << User.name_to_id($2)
+            user_id = User.name_to_id($2)
+            q[:uploader_id_neg] << user_id unless user_id.blank?
 
           when "user"
             q[:uploader_id] = User.name_to_id($2)
-            q[:uploader_id] = -1 if q[:uploader_id].nil?
+            q[:uploader_id] = -1 if q[:uploader_id].blank?
 
           when "-approver"
             q[:approver_id_neg] ||= []
-            q[:approver_id_neg] << User.name_to_id($2)
+            user_id = User.name_to_id($2)
+            q[:approver_id_neg] << user_id unless user_id.blank?
 
           when "approver"
             q[:approver_id] = User.name_to_id($2)
-            q[:approver_id] = -1 if q[:approver_id].nil?
+            q[:approver_id] = -1 if q[:approver_id].blank?
 
           when "commenter", "comm"
             q[:commenter_id] = User.name_to_id($2)
-            q[:commenter_id] = -1 if q[:commenter_id].nil?
+            q[:commenter_id] = -1 if q[:commenter_id].blank?
 
           when "noter"
             q[:noter_id] = User.name_to_id($2)
-            q[:noter_id] = -1 if q[:noter_id].nil?
+            q[:noter_id] = -1 if q[:noter_id].blank?
 
           when "-pool"
             q[:tags][:exclude] << "pool:#{Pool.name_to_id($2)}"
@@ -372,7 +374,7 @@ class Tag < ActiveRecord::Base
           when "status"
             q[:status] = $2.downcase
 
-          when "pixiv_id"
+          when "pixiv_id", "pixiv"
             q[:pixiv_id] = parse_helper($2)
 
           end

app/views/bans/index.html.erb

@@ -14,7 +14,7 @@
       <tbody>
         <% @bans.each do |ban| %>
           <tr id="ban-<%= ban.id %>">
-            <td><%= ban.user.name %></td>
+            <td><%= link_to(ban.user.name, user_path(ban.user_id), { :class => ban.user.level_class }) %></td>
             <td><%= ban.expires_at %></td>
             <td><%= ban.reason %></td>
             <td>

app/views/bans/show.html.erb

@@ -2,7 +2,7 @@
   <div class="show">
     <h1>Show Ban</h1>
     <ul>
-      <li><strong>User</strong>: <%= @ban.user.name %></li>
+      <li><strong>User</strong>: <%= link_to(@ban.user.name, user_path(@ban.user_id), { :class => @ban.user.level_class }) %></li>
       <li><strong>Expires</strong>: <%= compact_time @ban.expires_at %></li>
       <li><strong>Reason</strong>: <%= @ban.reason %></li>
     </ul>

app/views/comments/show.html.erb

@@ -2,10 +2,20 @@
   <div id="a-show">
     <div class="comments-for-post">
       <div class="list-of-comments">
-        <%= render "comments/partials/show/comment", :post => @comment.post, :comment => @comment, :show_header => false %>
+        <div class="post post-preview" data-tags="<%= @comment.post.tag_string %>" data-uploader="<%= @comment.post.uploader_name %>" data-rating="<%= @comment.post.rating %>" data-flags="<%= @comment.post.status %>" data-score="<%= @comment.post.score %>" data-parent-id="<%= @comment.post.parent_id %>" data-has-children="<%= @comment.post.has_children? %>">
+          <div class="preview">
+            <%= link_to(image_tag(@comment.post.preview_file_url), post_path(@comment.post)) %>
+          </div>
+          <%= render :partial => "comments/partials/show/comment", :collection => [@comment] %>
+          <div class="clearfix"></div>
+        </div>
       </div>
     </div>
   </div>
 </div>
 
-<%= render "secondary_links" %>
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Comment - <%= Danbooru.config.app_name %>
+<% end %>

app/views/static/contact.html.erb

@@ -3,3 +3,7 @@
 <h2>Questions &amp; Comments</h2>
 
 <p>You can reach the administrator of this site at <%= mail_to Danbooru.config.contact_email, nil, :encode => :hex %>.</p>
+
+<% content_for(:page_title) do %>
+  Contact - <%= Danbooru.config.app_name %>
+<% end %>

app/views/static/keyboard_shortcuts.html.erb

@@ -24,4 +24,8 @@
       </ul>
     </section>
   </div>
-</div>
+</div>
+
+<% content_for(:page_title) do %>
+  Keyboard Shortcuts - <%= Danbooru.config.app_name %>
+<% end %>

app/views/static/mrtg.html.erb

@@ -32,4 +32,8 @@
 
 <h3>1 day</h3>
 
-<img src="http://mrtg.vinax.net/switch3/switch3_29-year.png">
+<img src="http://mrtg.vinax.net/switch3/switch3_29-year.png">
+
+<% content_for(:page_title) do %>
+  MRTG - <%= Danbooru.config.app_name %>
+<% end %>

app/views/static/name_change.html.erb

@@ -7,3 +7,7 @@
 
   <p>For this reason user name changes are not supported.</p>
 </div>
+
+<% content_for(:page_title) do %>
+  Name Change - <%= Danbooru.config.app_name %>
+<% end %>

app/views/static/terms_of_service.html.erb

@@ -52,3 +52,6 @@
   </div>
 </div>
 
+<% content_for(:page_title) do %>
+  Rules - <%= Danbooru.config.app_name %>
+<% end %>