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

fixed post listing

Browse Source
This commit is contained in:
albert
2011-06-21 13:10:01 -04:00
parent 07f8dba7f2
commit fab37bc0d3
8 changed files with 80 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/posts/index.html.erb
View File

@@ -29,10 +29,7 @@
</aside>
<section id="content">
<% if @post_set.has_wiki? && @post_set.page < 2 %>
<%= render :partial => "wiki_pages/excerpt", :locals => {:wiki_page => @post_set.wiki_page, :tag => @post_set.tag} %>
<% end %>
<%= render :partial => "wiki_pages/excerpt", :locals => {:post_set => @post_set} %>
<%= render :partial => "posts/partials/index/posts", :locals => {:post_set => @post_set} %>
</section>

4
app/views/posts/partials/index/_posts.html.erb
View File

@@ -5,7 +5,7 @@
<div class="clearfix"></div>
<div class="paginator">
<%= smart_paginator(post_set) do |page| %>
<%= link_to(page, posts_path(:page => page, :tags => params[:tags])) %>
<%= smart_paginator(post_set.posts) do |page| %>
<%= link_to(page, posts_path(:page => page, :tags => post_set.tags)) %>
<% end %>
</div>

39
app/views/wiki_pages/_excerpt.html.erb
View File

@@ -1,25 +1,26 @@
<!--
- wiki_page
- tag
- post_set
-->
<div id="wiki-page-excerpt">
<h1>Wiki</h1>
<div id="hide-or-show-wiki-page-excerpt">
<span id="hide-wiki-page-excerpt">(hide)</span>
<span id="show-wiki-page-excerpt">(show)</span>
</div>
<% if post_set.has_wiki? %>
<div id="wiki-page-excerpt">
<h1>Wiki</h1>
<div id="wiki-page-excerpt-content">
<% if wiki_page %>
<div class="prose">
<%= format_text(wiki_page.presenter.excerpt) %>
<div id="hide-or-show-wiki-page-excerpt">
<span id="hide-wiki-page-excerpt">(hide)</span>
<span id="show-wiki-page-excerpt">(show)</span>
</div>
<p>Read the <%= link_to "full article", wiki_page_path(wiki_page.id) %>.</p>
</div>
<% else %>
<p>There is currently no wiki page for the tag "<%= tag %>". You can <%= link_to "create one", new_wiki_page_path(:wiki_page => {:title => tag}) %>.</p>
<% end %>
<div id="wiki-page-excerpt-content">
<% if post_set.wiki_page %>
<div class="prose">
<%= format_text(post_set.wiki_page.presenter.excerpt) %>
<p>Read the <%= link_to "full article", wiki_page_path(post_set.wiki_page.id) %>.</p>
</div>
<% else %>
<p>There is currently no wiki page for the tag "<%= post_set.tag_string %>". You can <%= link_to "create one", new_wiki_page_path(:wiki_page => {:title => post_set.tag_string}) %>.</p>
<% end %>
</div>
</div>
</div>
<% end %>