dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix merge conflict.

This commit is contained in:
Parker Moore 2013-09-07 00:12:15 -04:00
parent 2d8edb9516 e87006206e
commit d9f73cad9d
7 changed files with 72 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
History.markdown
View File

@ -3,13 +3,16 @@
### Major Enhancements
### Minor Enhancements
* Disable reverse lookup when running `jekyll serve` (#1363)
### Bug Fixes
### Development Fixes
* Add a rake task to generate a new release post (#1404)
### Site Enhancements
* Fix a couple of validation errors on the site (#1511)
* Make navigation menus reusable (#1507)
* Fix link to History page from Release v1.2.0 notes post.
## v1.2.0 / 2013-09-06

24
Rakefile
View File

@ -211,6 +211,30 @@ namespace :site do
abort "You seem to have misplaced your History.markdown file. I can haz?"
end
end
namespace :releases do
desc "Create new release post"
task :new, :version do |t, args|
raise "Specify a version: rake site:releases:new['1.2.3']" unless args.version
today = Time.new.strftime('%Y-%m-%d')
filename = "site/_posts/#{today}-jekyll-#{release.split('.').join('-')}-released.markdown"
File.open(filename, "wb") do |post|
post.puts("---")
post.puts("layout: news_item")
post.puts("title: 'Jekyll #{release} Released'")
post.puts("date: #{Time.new.strftime('%Y-%m-%d %H:%M:%S %z')}")
post.puts("author: ")
post.puts("version: #{version}")
post.puts("categories: [release]")
post.puts("---")
post.puts
post.puts
end
puts "Created #{filename}"
end
end
end
#############################################################################

3
lib/jekyll/commands/serve.rb
View File

@ -20,7 +20,8 @@ module Jekyll
s = HTTPServer.new(
:Port => options['port'],
:BindAddress => options['host'],
:MimeTypes => mime_types
:MimeTypes => mime_types,
:DoNotReverseLookup => true
)
s.mount(options['baseurl'], HTTPServlet::FileHandler, destination, fh_option)

93
site/_includes/docs_contents.html
View File

@ -1,97 +1,16 @@
<div class="unit one-fifth hide-on-mobiles">
<aside>
<h4>Getting Started</h4>
<ul>
<li class="{% if page.title == 'Welcome' %}current{% endif %}">
<a href="{{ site.url }}/docs/home/">Welcome</a>
</li>
<li class="{% if page.title == 'Quick-start guide' %}current{% endif %}">
<a href="{{ site.url }}/docs/quickstart/">Quick-start guide</a>
</li>
<li class="{% if page.title == 'Installation' %}current{% endif %}">
<a href="{{ site.url }}/docs/installation/">Installation</a>
</li>
<li class="{% if page.title == 'Basic Usage' %}current{% endif %}">
<a href="{{ site.url }}/docs/usage/">Basic Usage</a>
</li>
<li class="{% if page.title == 'Directory structure' %}current{% endif %}">
<a href="{{ site.url }}/docs/structure/">Directory structure</a>
</li>
<li class="{% if page.title == 'Configuration' %}current{% endif %}">
<a href="{{ site.url }}/docs/configuration/">Configuration</a>
</li>
</ul>
{% include docs_ul.html items='home quickstart installation usage structure configuration' %}
<h4>Your Content</h4>
<ul>
<li class="{% if page.title == 'Front-matter' %}current{% endif %}">
<a href="{{ site.url }}/docs/frontmatter/">Front-matter</a>
</li>
<li class="{% if page.title == 'Writing posts' %}current{% endif %}">
<a href="{{ site.url }}/docs/posts/">Writing posts</a>
</li>
<li class="{% if page.title == 'Working with drafts' %}current{% endif %}">
<a href="{{ site.url }}/docs/drafts/">Working with drafts</a>
</li>
<li class="{% if page.title == 'Creating pages' %}current{% endif %}">
<a href="{{ site.url }}/docs/pages/">Creating pages</a>
</li>
<li class="{% if page.title == 'Variables' %}current{% endif %}">
<a href="{{ site.url }}/docs/variables/">Variables</a>
</li>
<li class="{% if page.title == 'Blog migrations' %}current{% endif %}">
<a href="{{ site.url }}/docs/migrations/">Blog migrations</a>
</li>
</ul>
{% include docs_ul.html items='frontmatter posts drafts pages variables migrations' %}
<h4>Customization</h4>
<ul>
<li class="{% if page.title == 'Templates' %}current{% endif %}">
<a href="{{ site.url }}/docs/templates/">Templates</a>
</li>
<li class="{% if page.title == 'Permalinks' %}current{% endif %}">
<a href="{{ site.url }}/docs/permalinks/">Permalinks</a>
</li>
<li class="{% if page.title == 'Pagination' %}current{% endif %}">
<a href="{{ site.url }}/docs/pagination/">Pagination</a>
</li>
<li class="{% if page.title == 'Plugins' %}current{% endif %}">
<a href="{{ site.url }}/docs/plugins/">Plugins</a>
</li>
<li class="{% if page.title == 'Extras' %}current{% endif %}">
<a href="{{ site.url }}/docs/extras/">Extras</a>
</li>
</ul>
{% include docs_ul.html items='templates permalinks pagination plugins extras' %}
<h4>Deployment</h4>
<ul>
<li class="{% if page.title == 'GitHub Pages' %}current{% endif %}">
<a href="{{ site.url }}/docs/github-pages/">GitHub Pages</a>
</li>
<li class="{% if page.title == 'Deployment methods' %}current{% endif %}">
<a href="{{ site.url }}/docs/deployment-methods/">Other methods</a>
</li>
</ul>
{% include docs_ul.html items='github-pages deployment-methods' %}
<h4>Miscellaneous</h4>
<ul>
<li class="{% if page.title == 'Troubleshooting' %}current{% endif %}">
<a href="{{ site.url }}/docs/troubleshooting/">Troubleshooting</a>
</li>
<li class="{% if page.title == 'Sites using Jekyll' %}current{% endif %}">
<a href="{{ site.url }}/docs/sites/">Sites using Jekyll</a>
</li>
<li class="{% if page.title == 'Resources' %}current{% endif %}">
<a href="{{ site.url }}/docs/resources/">Resources</a>
</li>
<li class="{% if page.title == 'Upgrading' %}current{% endif %}">
<a href="{{ site.url }}/docs/upgrading/">Upgrading</a>
</li>
</ul>
{% include docs_ul.html items='troubleshooting sites resources upgrading' %}
<h4>Meta</h4>
<ul>
<li class="{% if page.title == 'Contributing' %}current{% endif %}">
<a href="{{ site.url }}/docs/contributing/">Contributing</a>
</li>
<li class="{% if page.title == 'History' %}current{% endif %}">
<a href="{{ site.url }}/docs/history/">History</a>
</li>
</ul>
{% include docs_ul.html items='contributing history' %}
</aside>
</div>

31
site/_includes/docs_contents_mobile.html
View File

@ -2,41 +2,22 @@
<select onchange="if (this.value) window.location.href=this.value">
<option value="">Navigate the docs…</option>
<optgroup label="Getting started">
<option value="{{ site.url }}/docs/home/">Welcome</option>
<option value="{{ site.url }}/docs/quickstart/">Quick-start guide</option>
<option value="{{ site.url }}/docs/installation/">Installation</option>
<option value="{{ site.url }}/docs/usage/">Basic Usage</option>
<option value="{{ site.url }}/docs/structure/">Directory structure</option>
<option value="{{ site.url }}/docs/configuration/">Configuration</option>
{% include docs_option.html items='home quickstart installation usage structure configuration' %}
</optgroup>
<optgroup label="Your Content">
<option value="{{ site.url }}/docs/frontmatter/">Front-matter</option>
<option value="{{ site.url }}/docs/posts/">Writing posts</option>
<option value="{{ site.url }}/docs/drafts/">Working with drafts</option>
<option value="{{ site.url }}/docs/pages/">Creating pages</option>
<option value="{{ site.url }}/docs/variables/">Variables</option>
<option value="{{ site.url }}/docs/migrations/">Blog migrations</option>
{% include docs_option.html items='frontmatter posts drafts pages variables migrations' %}
</optgroup>
<optgroup label="Customization">
<option value="{{ site.url }}/docs/templates/">Templates</option>
<option value="{{ site.url }}/docs/permalinks/">Permalinks</option>
<option value="{{ site.url }}/docs/pagination/">Pagination</option>
<option value="{{ site.url }}/docs/plugins/">Plugins</option>
<option value="{{ site.url }}/docs/extras/">Extras</option>
{% include docs_option.html items='templates permalinks pagination plugins extras' %}
</optgroup>
<optgroup label="Deployment">
<option value="{{ site.url }}/docs/github-pages/">GitHub Pages</option>
<option value="{{ site.url }}/docs/deployment-methods/">Other methods</option>
{% include docs_option.html items='github-pages deployment-methods' %}
</optgroup>
<optgroup label="Miscellaneous">
<option value="{{ site.url }}/docs/troubleshooting/">Troubleshooting</option>
<option value="{{ site.url }}/docs/sites/">Sites using Jekyll</option>
<option value="{{ site.url }}/docs/resources/">Resources</option>
<option value="{{ site.url }}/docs/upgrading/">Upgrading</option>
{% include docs_option.html items='troubleshooting sites resources upgrading' %}
</optgroup>
<optgroup label="Meta">
<option value="{{ site.url }}/docs/contributing/">Contributing</option>
<option value="{{ site.url }}/docs/history/">History</option>
{% include docs_option.html items='contributing history' %}
</optgroup>
</select>
</div>

11
site/_includes/docs_option.html Normal file
View File

@ -0,0 +1,11 @@
{% assign items = include.items | split: ' ' %}
{% for item in items %}
{% assign item_url = item | prepend:'/docs/' | append:'/' %}
{% for p in site.pages %}
{% if p.url == item_url %}
<option value="{{ site.url }}{{ p.url }}">{{ p.title }}</option>
{% endif %}
{% endfor %}
{% endfor %}

20
site/_includes/docs_ul.html Normal file
View File

@ -0,0 +1,20 @@
{% assign items = include.items | split: ' ' %}
<ul>
{% for item in items %}
{% assign item_url = item | prepend:'/docs/' | append:'/' %}
{% if item_url == page.url %}
{% assign c = 'current' %}
{% else %}
{% assign c = '' %}
{% endif %}
{% for p in site.pages %}
{% if p.url == item_url %}
<li class="{{ c }}"><a href="{{ site.url }}{{ p.url }}">{{ p.title }}</a></li>
{% endif %}
{% endfor %}
{% endfor %}
</ul>