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

style updates

Browse Source
This commit is contained in:
albert
2013-03-17 23:48:06 -04:00
parent a52eb3ddc2
commit 04b18abc6e
6 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/stylesheets/specific/comments.css.scss
View File

@@ -5,9 +5,10 @@ div.comments-for-post {
margin: 1em 0; margin: 1em 0;
} }
.info { p.info {
color: #AAA; color: #AAA;
font-style: italic; font-style: italic;
font-size: 80%;
} }
div.list-of-comments { div.list-of-comments {

6
app/assets/stylesheets/specific/forum.css.scss
View File

@@ -1,4 +1,10 @@
div.list-of-forum-posts { div.list-of-forum-posts {
p.info {
color: #AAA;
font-style: italic;
font-size: 80%;
}
article { article {
margin-bottom: 3em; margin-bottom: 3em;

4
app/models/forum_post.rb
View File

@@ -110,6 +110,10 @@ class ForumPost < ActiveRecord::Base
User.id_to_name(creator_id) User.id_to_name(creator_id)
end end
def updater_name
User.id_to_name(updater_id)
end
def quoted_response def quoted_response
stripped_body = body.gsub(/\[quote\](?:.|\n|\r)+?\[\/quote\][\n\r]*/m, "") stripped_body = body.gsub(/\[quote\](?:.|\n|\r)+?\[\/quote\][\n\r]*/m, "")
"[quote]\n#{creator_name} said:\n\n#{stripped_body}\n[/quote]\n\n" "[quote]\n#{creator_name} said:\n\n#{stripped_body}\n[/quote]\n\n"

2
app/views/comments/partials/show/_comment.html.erb
View File

@@ -10,7 +10,7 @@
<%= format_text(comment.body) %> <%= format_text(comment.body) %>
<% if comment.updater_id.present? && (comment.updater_id != comment.creator_id || comment.created_at != comment.updated_at) %> <% if comment.updater_id.present? && (comment.updater_id != comment.creator_id || comment.created_at != comment.updated_at) %>
<p class="info">Updated by <%= link_to comment.updater_name, user_path(comment.updater_id) %> <%= time_ago_in_words_tagged(comment.updated_at) %>.</p> <p class="info">Updated by <%= link_to comment.updater_name, user_path(comment.updater_id) %> <%= time_ago_in_words_tagged(comment.updated_at) %></p>
<% end %> <% end %>
</div> </div>
<menu> <menu>

3
app/views/forum_posts/_forum_post.html.erb
View File

@@ -15,6 +15,9 @@
<div class="prose"> <div class="prose">
<%= format_text(forum_post.body) %> <%= format_text(forum_post.body) %>
</div> </div>
<% if forum_post.updated_at != forum_post.created_at %>
<p class="info">Updated by <%= link_to forum_post.updater_name, user_path(forum_post.updater_id) %> <%= time_ago_in_words_tagged(forum_post.updated_at) %></p>
<% end %>
<menu> <menu>
<li>ID: <%= forum_post.id %></li> <li>ID: <%= forum_post.id %></li>
<% if @forum_topic %> <% if @forum_topic %>

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

@@ -14,7 +14,7 @@
<li>Source: <%= post_source_tag(post) %></li> <li>Source: <%= post_source_tag(post) %></li>
<li>Rating: <%= post.pretty_rating %></li> <li>Rating: <%= post.pretty_rating %></li>
<li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_privileged? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li> <li>Score: <span id="score-for-post-<%= post.id %>"><%= post.score %></span> <% if CurrentUser.is_privileged? %>(vote <%= link_to "up", post_votes_path(:post_id => post.id, :score => "up"), :remote => true, :method => :post %>/<%= link_to "down", post_votes_path(:post_id => post.id, :score => "down"), :remote => true, :method => :post %>)<% end %></li>
<li>Fav count: <%= post.fav_count %></li> <li>Favorites: <%= post.fav_count %></li>
<li> <li>
Status: Status:
<% if post.is_pending? %> <% if post.is_pending? %>