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

app/views/artist_versions/_secondary_links.html.erb

@@ -0,0 +1,7 @@
+<% content_for(:secondary_links) do %>
+  <menu>
+    <li><%= link_to "Artists", artists_path %></li>
+    <li><%= link_to "New", new_artist_path %></li>
+    <li><%= link_to "Search", search_artist_versions_path %></li>
+  </menu>
+<% end %>

app/views/artist_versions/index.html.erb

@@ -51,7 +51,7 @@
   </div>
 </div>
 
-<%= render "artists/secondary_links" %>
+<%= render "secondary_links" %>
 
 <% content_for(:page_title) do %>
   Artist Versions - <%= Danbooru.config.app_name %>

app/views/artist_versions/search.html.erb

@@ -0,0 +1,19 @@
+<div id="c-artist-versions">
+  <div id="a-search">
+    <h1>Search Changes</h1>
+
+    <div id="search">
+      <%= form_tag(artist_versions_path, :method => :get, :class => "simple_form") do %>
+        <%= search_field "updater_name", :label => "User" %>
+        <%= search_field "name", :label => "Name" %>
+        <%= submit_tag "Search" %>
+      <% end %>
+    </div>
+  </div>
+</div>
+
+<%= render "secondary_links" %>
+
+<% content_for(:page_title) do %>
+  Search Artist Changes - <%= Danbooru.config.app_name %>
+<% end %>

app/views/dmails/index.html.erb

@@ -15,6 +15,7 @@
           <th>From</th>
           <th>To</th>
           <th>Subject</th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
@@ -24,6 +25,9 @@
             <td><%= link_to_user dmail.from %></td>
             <td><%= link_to_user dmail.to %></td>
             <td><%= link_to dmail.title, dmail_path(dmail) %></td>
+            <td>
+              <%= link_to "delete", dmail_path(dmail), :method => :delete, :confirm => "Are you sure you want to delete this Dmail?" %>
+            </td>
           </tr>
         <% end %>
       </tbody>

app/views/layouts/default.html.erb

@@ -48,7 +48,7 @@
       <%= render "users/ban_notice" %>
     <% end %>
 
-    <% if CurrentUser.dmail_count.present? %>
+    <% if CurrentUser.dmail_count.present? && CurrentUser.dmails.unread.present? && cookies[:hide_dmail_notice].to_i != CurrentUser.dmails.unread.first.id %>
       <%= render "users/dmail_notice" %>
     <% end %>
 

app/views/pools/_search.html.erb

@@ -32,7 +32,7 @@
         <th><label for="search_sort">Order</th>
         <td>
           <div class="input">
-            <%= select "search", "sort", [["Last updated", "updated_at"], ["Name", "name"]], :selected => params[:search][:sort] %>
+            <%= select "search", "sort", [["Last updated", "updated_at"], ["Name", "name"], ["Recently created", "created_at"], ["Post count", "post_count"]], :selected => params[:search][:sort] %>
           </div>
         </td>
       </tr>

app/views/pools/show.html.erb

@@ -8,7 +8,7 @@
       <% end %>
     </h1>
 
-    <div id="description">
+    <div id="description" class="prose">
       <%= format_text(@pool.description) %>
     </div>
 

app/views/posts/partials/show/_image.html.erb

@@ -1,2 +1,2 @@
-<%= image_tag(post.file_url_for(CurrentUser.user), :width => post.image_width_for(CurrentUser.user), :height => post.image_height_for(CurrentUser.user), :id => "image", "data-original-width" => post.image_width, "data-original-height" => post.image_height, "data-large-width" => post.large_image_width, "data-large-height" => post.large_image_height, "data-tags" => post.tag_string, "data-user" => post.uploader_name, "data-rating" => post.rating, "data-flags" => post.status_flags, "data-parent-id" => post.parent_id, "data-has-children" => post.has_children?, "data-score" => post.score, "data-fav-count" => post.fav_count) %>
+<%= image_tag(post.file_url_for(CurrentUser.user), :width => post.image_width_for(CurrentUser.user), :height => post.image_height_for(CurrentUser.user), :id => "image", "data-original-width" => post.image_width, "data-original-height" => post.image_height, "data-large-width" => post.large_image_width, "data-large-height" => post.large_image_height, "data-tags" => post.tag_string, "data-uploader" => post.uploader_name, "data-rating" => post.rating, "data-flags" => post.status_flags, "data-parent-id" => post.parent_id, "data-has-children" => post.has_children?, "data-score" => post.score, "data-fav-count" => post.fav_count) %>
 

app/views/posts/partials/show/_options.html.erb

@@ -9,6 +9,9 @@
   <% else %>
     <li><%= link_to "Add note", "#", :id => "translate", :title => "Shortcut is N" %></li>
   <% end %>
+  <% if CurrentUser.is_builder? %>
+    <li><%= link_to "Copy all notes", "#", :id => "copy-notes" %></li>
+  <% end %>
   <li><%= link_to "Find similar", "http://danbooru.iqdb.org/db-search.php?url=http://#{Danbooru.config.hostname}#{post.preview_file_url}" %></li>
 
   <% if post.is_status_locked? %>

app/views/posts/show.html.erb

@@ -40,7 +40,7 @@
 
       <%= render "posts/partials/show/notices", :post => @post %>
 
-      <section id="image-container" data-tags="<%= @post.tag_string %>" data-user="<%= @post.uploader_name %>" data-rating="<%= @post.rating %>" data-flags="<%= @post.status_flags %>">
+      <section id="image-container" data-tags="<%= @post.tag_string %>" data-uploader="<%= @post.uploader_name %>" data-rating="<%= @post.rating %>" data-flags="<%= @post.status_flags %>">
         <div id="note-container"></div>
         <div id="note-preview"></div>
         <%= @post.presenter.image_html(self) %>

app/views/users/_dmail_notice.html.erb

@@ -1,3 +1,4 @@
-<div class="ui-corner-all ui-state-highlight" id="dmail-notice">
+<div class="ui-corner-all ui-state-highlight" id="dmail-notice" data-id="<%= CurrentUser.dmails.unread.first.id %>">
   <h1>You have <%= link_to "unread mail", dmails_path(:search => {:owner_id => CurrentUser.id, :to_id => CurrentUser.id}, :folder => "received") %>.</h1>
+  <p><%= link_to "Close this", "#", :id => "hide-dmail-notice" %></p>
 </div>

app/views/wiki_page_versions/index.html.erb

@@ -9,8 +9,11 @@
         <table width="100%" class="striped">
           <thead>
             <tr>
-              <th width="2%"></th>
-              <th width="2%"></th>
+              <% if params[:search] && params[:search][:wiki_page_id] && @wiki_page_versions.length > 1 %>
+                <th width="3%"></th>
+                <th width="2%"></th>
+                <th width="2%"></th>
+              <% end %>
               <th>Title</th>
               <th width="5%"></th>
               <% if CurrentUser.is_admin? %>
@@ -20,19 +23,32 @@
             </tr>
           </thead>
           <tbody>
-            <% @wiki_page_versions.each do |wiki_page_version| %>
+            <% @wiki_page_versions.each_with_index do |wiki_page_version, i| %>
               <tr>
-                <td>
-                  <% if params[:search] && params[:search][:wiki_page_id] %>
-                    <%= radio_button_tag "thispage", wiki_page_version.id %>
-                  <% end %>
-                </td>
-                <td>
-                  <% if params[:search] && params[:search][:wiki_page_id] %>
-                    <%= radio_button_tag "otherpage", wiki_page_version.id %>
-                  <% end %>
-                </td>
-                <td><%= link_to wiki_page_version.title, wiki_page_version_path(wiki_page_version) %></td>
+                <% if params[:search] && params[:search][:wiki_page_id] && @wiki_page_versions.length > 1 %>
+                  <td>
+                    <% 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 %>
+                  </td>
+                  <td>
+                    <% if i == 1 %>
+                      <%= radio_button_tag "thispage", wiki_page_version.id, :checked => true %>
+                    <% else %>
+                      <%= radio_button_tag "thispage", wiki_page_version.id %>
+                    <% end %>
+                  </td>
+                  <td>
+                    <% if i == 0 %>
+                      <%= radio_button_tag "otherpage", wiki_page_version.id, :checked => true %>
+                    <% else %>
+                      <%= radio_button_tag "otherpage", wiki_page_version.id %>
+                    <% end %>
+                  </td>
+                <% end %>
+                <td class="category-<%= wiki_page_version.category_name %>"><%= link_to wiki_page_version.title, wiki_page_version_path(wiki_page_version) %></td>
                 <td><%= link_to "wiki", wiki_page_path(wiki_page_version.wiki_page_id) %></td>
                 <% if CurrentUser.is_admin? %>
                   <td>

app/views/wiki_pages/index.html.erb

@@ -15,7 +15,7 @@
         <tbody>
           <% @wiki_pages.each do |wiki_page| %>
             <tr>
-              <td class="tag-category-<%= wiki_page.category_name %>"><%= link_to wiki_page.pretty_title, wiki_page_path(wiki_page, :noredirect => 1) %></td>
+              <td class="category-<%= wiki_page.category_name %>"><%= link_to wiki_page.pretty_title, wiki_page_path(wiki_page, :noredirect => 1) %></td>
               <td><%= wiki_page.updated_at.strftime("%Y-%m-%d %I:%M") %> by <%= h link_to_user wiki_page.updater %></td>
             </tr>
           <% end %>

app/views/wiki_pages/show_or_new.html.erb

@@ -3,7 +3,7 @@
     <%= render "sidebar" %>
 
     <section id="content">
-      <h1 id="wiki-page-title"><%= params[:title] %></h1>
+      <h1 id="wiki-page-title"><%= @wiki_page.pretty_title %></h1>
       <div id="wiki-page-body" class="prose">
         <p>This wiki page does not exist. <%= link_to "Create new wiki page", new_wiki_page_path(:wiki_page => {:title => params[:title]}) %>.</p>
       </div>