diff options
| -rw-r--r-- | .themes/classic/source/_includes/article.html | 4 | ||||
| -rw-r--r-- | .themes/classic/source/_layouts/page.html | 2 | ||||
| -rw-r--r-- | plugins/custom_filters.rb | 1 | ||||
| -rw-r--r-- | plugins/include_code.rb | 9 |
4 files changed, 12 insertions, 4 deletions
diff --git a/.themes/classic/source/_includes/article.html b/.themes/classic/source/_includes/article.html index 69bb5008..a25691f8 100644 --- a/.themes/classic/source/_includes/article.html +++ b/.themes/classic/source/_includes/article.html @@ -11,10 +11,10 @@ </header> {% endunless %} {% if index %} - <div class="entry-content">{{ content | exerpt | smart_quotes }}</div> + <div class="entry-content">{{ content | full_urls: site.root | exerpt | smart_quotes }}</div> <footer> <a rel="full-article" href="{{ site.root }}{{ post.url }}">Read on →</a> </footer> {% else %} -<div class="entry-content">{{ content | smart_quotes }}</div> +<div class="entry-content">{{ content | full_urls: site.root | smart_quotes }}</div> {% endif %} diff --git a/.themes/classic/source/_layouts/page.html b/.themes/classic/source/_layouts/page.html index 07dd050d..5749b4de 100644 --- a/.themes/classic/source/_layouts/page.html +++ b/.themes/classic/source/_layouts/page.html @@ -8,7 +8,7 @@ layout: default <h1 class="entry-title">{{ page.title | titlecase }}</h1> {% if page.date %}<p class="meta">{% include post/date.html %}</p>{% endif %} </header> - {{ content | smart_quotes }} + {{ content | full_urls: site.root | smart_quotes }} {% unless page.footer == false %} <footer> {% if page.date %}<p class="meta">{% include post/date.html %}</p>{% endif %} diff --git a/plugins/custom_filters.rb b/plugins/custom_filters.rb index f0db30ee..0a7604f7 100644 --- a/plugins/custom_filters.rb +++ b/plugins/custom_filters.rb @@ -21,6 +21,7 @@ module OctopressFilters # Replaces relative urls with full urls def full_urls(input, url='') + url ||= '' input.gsub /(\s+(href|src)\s*=\s*["|']{1})(\/[^\"'>]+)/ do $1+url+$3 end diff --git a/plugins/include_code.rb b/plugins/include_code.rb index e00f1c81..6a7d786e 100644 --- a/plugins/include_code.rb +++ b/plugins/include_code.rb @@ -5,13 +5,20 @@ # # Syntax {% include_code path/to/file %} # -# Example: +# Example 1: # {% include_code javascripts/test.js %} # # This will import test.js from source/downloads/code/javascripts/test.js # and output the contents in a syntax highlighted code block inside a figure, # with a figcaption listing the file name and download link # +# Example 2: +# You can also include an optional title for the <figcaption> +# +# {% include_code Example 2 javascripts/test.js %} +# +# will output a figcaption with the title: Example 2 (test.js) +# require 'pathname' |