jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
albert
2013-04-04 17:49:51 -04:00
parent 374e96c2fe 91f8fddb18
commit a7798d96ac
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/pool_versions_helper.rb
View File

@@ -9,6 +9,6 @@ module PoolVersionsHelper
added = current.post_id_array - prev.post_id_array added = current.post_id_array - prev.post_id_array
removed = prev.post_id_array - current.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
end end

2
app/presenters/post_presenter.rb
View File

@@ -99,7 +99,7 @@ class PostPresenter < Presenter
pool = Pool.where(:id => template.params[:pool_id]).first pool = Pool.where(:id => template.params[:pool_id]).first
return if pool.nil? return if pool.nil?
return if pool.neighbors(@post).next.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 else
nil nil
end end

2
app/views/pool_elements/_new.html.erb
View File

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

2
app/views/pool_orders/edit.html.erb
View File

@@ -1,6 +1,6 @@
<div id="c-pool-orders"> <div id="c-pool-orders">
<div id="a-edit"> <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> <p>Drag and drop the list below to determine ordering.</p>
<ul id="sortable"> <ul id="sortable">

2
app/views/pool_versions/index.html.erb
View File

@@ -17,7 +17,7 @@
<tbody> <tbody>
<% @pool_versions.each do |pool_version| %> <% @pool_versions.each do |pool_version| %>
<tr> <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><%= 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><%= 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> <td><%= link_to pool_version.updater_name, user_path(pool_version.updater_id), { :class => pool_version.updater.level_class } %></td>

4
app/views/pools/edit.html.erb
View File

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