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

app/helpers/pool_versions_helper.rb

@@ -9,6 +9,6 @@ module PoolVersionsHelper
     added = current.post_id_array - prev.post_id_array
     removed = prev.post_id_array - current.post_id_array
 
-    (added.map {|x| '<ins><a href="/posts/' + x.to_s + '">' + x.to_s + '</a></ins>'}.join(" ") + removed.map {|x| '<del><a href="/posts/' + x.to_s + '">' + x.to_s + '</a></del>'}.join(" ")).html_safe
+    (added.map {|x| '<ins><a href="/posts/' + x.to_s + '">' + x.to_s + '</a></ins>'}.join(" ") + " " + removed.map {|x| '<del><a href="/posts/' + x.to_s + '">' + x.to_s + '</a></del>'}.join(" ")).html_safe
   end
 end

app/presenters/post_presenter.rb

@@ -99,7 +99,7 @@ class PostPresenter < Presenter
       pool = Pool.where(:id => template.params[:pool_id]).first
       return if pool.nil?
       return if pool.neighbors(@post).next.nil?
-      template.link_to("Next in #{pool.name}", template.post_path(pool.neighbors(@post).next))
+      template.link_to("Next in #{pool.pretty_name}", template.post_path(pool.neighbors(@post).next))
     else
       nil
     end

app/views/pool_elements/_new.html.erb

@@ -19,7 +19,7 @@
         <h1>Recent Pools</h1>
         <ul id="recent-pools">
           <% recent_updated_pools.each do |pool| %>
-            <li><%= pool.name %></li>
+            <li><%= pool.pretty_name %></li>
           <% end %>
         </ul>
       </div>

app/views/pool_orders/edit.html.erb

@@ -1,6 +1,6 @@
 <div id="c-pool-orders">
   <div id="a-edit">
-    <h1>Order Pool: <%= @pool.name %></h1>
+    <h1>Order Pool: <%= @pool.pretty_name %></h1>
     <p>Drag and drop the list below to determine ordering.</p>
 
     <ul id="sortable">

app/views/pool_versions/index.html.erb

@@ -17,7 +17,7 @@
       <tbody>
         <% @pool_versions.each do |pool_version| %>
           <tr>
-            <td><%= link_to pool_version.pool.name, pool_path(pool_version.pool_id) %></td>
+            <td><%= link_to pool_version.pool.pretty_name, pool_path(pool_version.pool_id) %></td>
             <td><%= link_to pool_version.post_id_array.size, pool_versions_path(:search => {:pool_id => pool_version.pool_id}) %></td>
             <td><%= pool_version_diff(pool_version) %></td>
             <td><%= link_to pool_version.updater_name, user_path(pool_version.updater_id), { :class => pool_version.updater.level_class } %></td>

app/views/pools/edit.html.erb

@@ -1,8 +1,8 @@
 <div id="c-pools">
   <div id="a-edit">
     <%= simple_form_for(@pool) do |f| %>
-      <h1>Edit Pool: <%= @pool.name %></h1>
-      <%= f.input :name %>
+      <h1>Edit Pool: <%= @pool.pretty_name %></h1>
+      <%= f.input :name, :input_html => { :value => @pool.pretty_name } %>
       <%= f.input :description %>
       <%= f.input :post_ids, :label => "Posts" %>
       <%= f.input :is_active %>