Merge branch '2.1' of github.com:imathis/octopress into 2.1

This commit is contained in:
Brandon Mathis 2012-09-29 22:48:26 -05:00
commit 340d9aea23
4 changed files with 6 additions and 6 deletions

View File

@ -5,4 +5,4 @@ title: Page Not Found
Oops, I couldn't find that page! Sorry about that.
Maybe try the search box (top right), or look through the [archives](/archives)?
Maybe try the search box (top right), or look through the [archives](/archives/)?

View File

@ -1,4 +1,4 @@
<ul class="main-navigation">
<li><a href="{{ root_url }}/">Blog</a></li>
<li><a href="{{ root_url }}/archives">Archives</a></li>
<li><a href="{{ root_url }}/archives/">Archives</a></li>
</ul>

View File

@ -13,7 +13,7 @@ layout: default
{% if paginator.next_page %}
<a class="prev" href="{{paginator.next_page}}">&larr; Older</a>
{% endif %}
<a href="/archives">Blog Archives</a>
<a href="/archives/">Blog Archives</a>
{% if paginator.previous_page %}
<a class="next" href="{{paginator.previous_page}}">Newer &rarr;</a>
{% endif %}

View File

@ -200,10 +200,10 @@ task :isolate, :filename do |t, args|
else
filename = get_stdin("Enter a post file name: ")
end
stash_dir = "#{source_dir}/#{stash_dir}"
FileUtils.mkdir(stash_dir) unless File.exist?(stash_dir)
full_stash_dir = "#{source_dir}/#{stash_dir}"
FileUtils.mkdir(full_stash_dir) unless File.exist?(full_stash_dir)
Dir.glob("#{source_dir}/#{posts_dir}/*.*") do |post|
FileUtils.mv post, stash_dir unless post.include?(filename)
FileUtils.mv post, full_stash_dir unless post.include?(filename)
end
end