edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

post histories finished

Browse Source
This commit is contained in:
albert 2010-11-06 12:16:24 -04:00
parent f3b4312ef3
commit 190beedb7a
13 changed files with 125 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/post_histories_controller.rb
View File

@ -1,6 +1,6 @@
class PostHistoriesController < ApplicationController
def index
@search = PostHistory.search(params[:search])
@histories = @search.paginate(:page => params[:page], :per_page => 20)
@histories = @search.paginate(:page => params[:page], :per_page => 20, :order => "updated_at DESC")
end
end

6
app/models/post_history.rb
View File

@ -51,9 +51,13 @@ class PostHistory < ActiveRecord::Base
hash["updated_at"]
end
def updater_id
def user_id
hash["user_id"]
end
def presenter
@presenter ||= PostHistoryRevisionPresenter.new(self)
end
end
before_validation :initialize_revisions, :on => :create

19
app/presenters/post_history_presenter.rb
View File

@ -1,19 +0,0 @@
class PostHistoryPresenter < Presenter
attr_reader :revision
def initialize(revision)
@revision = revision
end
def changes
end
def updated_at
revision["updated_at"]
end
def updater_name
User.id_to_name(revision["user_id"].to_i)
end
end

25
app/presenters/post_history_revision_presenter.rb Normal file
View File

@ -0,0 +1,25 @@
class PostHistoryRevisionPresenter < Presenter
attr_reader :revision
def initialize(revision)
@revision = revision
end
def changes
html = []
html << revision.diff[:del].map {|x| "<del>#{h(x)}</del>"}
html << revision.diff[:add].map {|x| "<ins>#{h(x)}</ins>"}
html << "<ins>source:#{h(revision.diff[:source])}</ins>" if revision.diff[:source].present?
html << "<ins>rating:#{h(revision.diff[:rating])}</ins>" if revision.diff[:rating].present?
html << "<ins>parent:#{revision.diff[:parent_id]}</ins>" if revision.diff[:parent_id].present?
html.join(" ").html_safe
end
def updated_at
Time.parse(revision.updated_at)
end
def updater_name
User.id_to_name(revision.user_id)
end
end

1
app/presenters/post_presenter.rb
View File

@ -10,6 +10,7 @@ class PostPresenter < Presenter
html << %{<img src="#{post.preview_file_url}">}
html << %{</a>}
html << %{</article>}
html.html_safe
end
def initialize(post)

8
app/presenters/presenter.rb
View File

@ -1,4 +1,12 @@
class Presenter
def self.h(s)
CGI.escapeHTML(s)
end
def self.u(s)
URI.escape(s)
end
def h(s)
CGI.escapeHTML(s)
end

8
app/views/post_histories/index.html.erb
View File

@ -9,25 +9,27 @@
</div>
<div class="history">
<table>
<table class="striped">
<thead>
<tr>
<th>Changes</th>
<th>Date</th>
<th>Updater</th>
<th>Changes</th>
</tr>
</thead>
<tbody>
<% history.each_revision do |revision| %>
<tr>
<td><%= revision.presenter.changes %></td>
<td><%= revision.presenter.updated_at %></td>
<td><%= revision.presenter.updater_name %></td>
<td><%= revision.presenter.changes %></td>
</tr>
<% end %>
</tbody>
</table>
</div>
<div class="clearfix"></div>
</div>
<% end %>
</div>

2
app/views/posts/partials/common/_secondary_links.html.erb
View File

@ -5,7 +5,7 @@
<li>Popular</li>
<li>Favorites</li>
<li>Subscriptions</li>
<li>Changes</li>
<li><%= link_to "Changes", post_histories_path %></li>
<li>Approvals</li>
<li>Moderate</li>
<li>Help</li>

4
app/views/posts/partials/show/_information.html.erb
View File

@ -10,6 +10,6 @@
(<%= post.image_width %>x<%= post.image_height %>)
<% end %>
</li>
<li><%= link_to "Tag History", post_versions_path(:post_id => post) %></li>
<li><%= link_to "Note History", note_versions_path(:post_id => post) %></li>
<li><%= link_to "Tag History", post_histories_path(:search => {:post_id_eq => post.id}) %></li>
<li><%= link_to "Note History", note_versions_path(:search => {:post_id_eq => post.id}) %></li>
</ul>

6
public/javascripts/compiled/default.js
View File

@ -785,8 +785,10 @@ $(document).ready(function() {
// Cookie.put('hide-upgrade-account', '1', 7);
// });
// Style button spans
// Table striping
$("table.striped tbody tr:even").addClass("even");
$("table.striped tbody tr:odd").addClass("odd");
// Comment listing
$(".comment-section form").hide();
$(".comment-section input.expand-comment-response").click(function() {

6
public/javascripts/src/app/application.js
View File

@ -6,8 +6,10 @@ $(document).ready(function() {
// Cookie.put('hide-upgrade-account', '1', 7);
// });
// Style button spans
// Table striping
$("table.striped tbody tr:even").addClass("even");
$("table.striped tbody tr:odd").addClass("odd");
// Comment listing
$(".comment-section form").hide();
$(".comment-section input.expand-comment-response").click(function() {

23
public/stylesheets/compiled/default.css
View File

@ -123,6 +123,11 @@ span.link {
table tfoot {
margin-top: 2em; }
table.striped tbody tr:hover {
background-color: #FFE; }
table.striped tr.even {
background-color: #EEE; }
div#notice {
margin: 1em;
padding: 1em;
@ -269,6 +274,24 @@ div.posts section#content menu#post-sections {
div.posts section#content menu#post-sections li.active a {
color: black; }
/*** Post Histories ***/
div.post_histories div.index div.post {
margin-bottom: 2em; }
div.post_histories div.index div.post div.preview {
width: 20%;
float: left; }
div.post_histories div.index div.post div.history {
width: 70%;
float: left; }
div.post_histories div.index div.post div.history table {
width: 100%; }
div.post_histories div.index div.post div.history ins {
color: green;
text-decoration: none; }
div.post_histories div.index div.post div.history del {
color: red;
text-decoration: line-through; }
/*** Comments ***/
div.comment-response > div {
margin-top: 1em; }

46
public/stylesheets/src/default.scss
View File

@ -159,6 +159,18 @@ table tfoot {
margin-top: 2em;
}
table.striped {
tbody {
tr:hover {
background-color: #FFE;
}
}
tr.even {
background-color: #EEE;
}
}
div#notice {
margin: 1em;
padding: 1em;
@ -421,6 +433,40 @@ div.posts {
}
/*** Post Histories ***/
div.post_histories {
div.index {
div.post {
margin-bottom: 2em;
div.preview {
width: 20%;
float: left;
}
div.history {
width: 70%;
float: left;
table {
width: 100%;
}
ins {
color: green;
text-decoration: none;
}
del {
color: red;
text-decoration: line-through;
}
}
}
}
}
/*** Comments ***/
div.comment-response {
}