moparisthebest/android.moparisthebest.org
1
0
Fork 0
mirror of https://github.com/moparisthebest/android.moparisthebest.org synced 2024-12-24 08:28:50 -05:00
Code Issues Releases Wiki Activity

Merge branch '2.1' into site-2.1

Browse Source
This commit is contained in:
Brandon Mathis 2012-05-20 22:23:42 -05:00
commit ad40321eff
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.themes/classic/source/404.markdown Normal file
View File

@ -0,0 +1,8 @@
---
layout: page
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)?

2
.themes/classic/source/_includes/custom/navigation.html
View File

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

0
.themes/classic/source/blog/archives/index.html → .themes/classic/source/archives/index.html
View File

2
.themes/classic/source/index.html
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="/blog/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 %}

2
README.markdown
View File

@ -16,7 +16,7 @@ Check out [Octopress.org](http://octopress.org/docs) for guides and documentatio
## Contributing
We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plug-ins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them them into our main releases.
We love to see people contributing to Octopress, whether it's a bug report, feature suggestion or a pull request. At the moment, we try to keep the core slick and lean, focusing on basic blogging needs, so some of your suggestions might not find their way into Octopress. For those ideas, we started a [list of 3rd party plug-ins](https://github.com/imathis/octopress/wiki/3rd-party-plugins), where you can link your own Octopress plug-in repositories. For the future, we're thinking about ways to easier add them them into our main releases.
## License

11
Rakefile
View File

@ -200,9 +200,14 @@ task :update_source, :theme do |t, args|
cp "#{source_dir}.old/favicon.png", source_dir
mv "#{source_dir}/index.html", "#{blog_index_dir}", :force=>true if blog_index_dir != source_dir
cp "#{source_dir}.old/index.html", source_dir if blog_index_dir != source_dir && File.exists?("#{source_dir}.old/index.html")
if File.exists?("#{source_dir}/archives/index.html")
rm "#{source_dir}/archives/index.html"
mv "#{source_dir}/blog/archives/index.html", "#{source_dir}/archives/index.html"
if File.exists?("#{source_dir}/blog/archives/index.html")
puts "## Moving blog/archives to /archives (standard location as of 2.1) ##"
file = "#{source_dir}/_includes/custom/navigation.html"
navigation = IO.read(file)
navigation = navigation.gsub(/(.*)\/blog(\/archives)(.*$)/m, '\1\2\3')
File.open(file, 'w') do |f|
f.write navigation
end
rm_r "#{source_dir}/blog/archives"
rm_r "#{source_dir}/blog" if Dir.entries("#{source_dir}/blog").join == "..."
end