octopress-ink 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab641c85bf02af85bd5c9ba9b9c62613a201301f
-  data.tar.gz: 6df6570f3fe6a12e03c4c7b1e31c93a802417ab9
+  metadata.gz: 5397beef85785ad3eea63834dcdd9719ef45730f
+  data.tar.gz: 3935fa2b9c4365a772cf461675f6368b435e86ff
 SHA512:
-  metadata.gz: 89b573c1496e0732295713fe2d5c6d80f98e0c95b89170a257a0a40d72f397ecc52be91e3efed82a736bae13ae503386fec582ec23bff95ec30e2538261776bf
-  data.tar.gz: 501eb1f5581b7e3f2f173d21912a577a48cabb534b60edb5f8045beb4dc40df581988a627f8e2523032d7afdfd70711b167eba3648e5e513f88f312f9f7a8956
+  metadata.gz: 4447119593a8679d92d7cb4e457d6fe1bf151c7eb809a05430e3a4e3227786e1f9faad9655e5206336b1cbfa2e3080ccaff4cea569c8fc9bfdcdef3f822d889e
+  data.tar.gz: 6be22e911e56e576d22abd5adcb9e8be65e3e497e8c71e52015471aaebefb6b26f6a1b388206413ca675fadb2f3ec13e14282f26b3a6d7f4ff63de1bf7c371da

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.2.1 (2015-09-07)
+- Fix: For bootstrap pages, titles no longer include site url. That should be handled by templates.
+
 ### 1.2.0 (2015-06-26)
 - New: you can configure output destinations for asset pipeline stylesheets and javascripts.
 

data/lib/octopress-ink/plugin/bootstrap.rb

@@ -351,7 +351,6 @@ module Octopress
       def page_title(page, config, lang)
         type = page_type(page)
         title = config['titles'][type]
-        title = title.sub(':site_name', Octopress.site.config['name'] || '')
         if lang && Octopress.multilingual?
           title = title.sub(':lang_name', Octopress::Multilingual.language_name(lang))
         end
@@ -368,18 +367,13 @@ module Octopress
         label
       end
 
-      def site_name
-        Octopress.site.config['name'] ? '- :site_name' : ''
-      end
-
-
       # Default configuration settings
       # Plugin authors can use or override these settings
       #
       def post_index_config
 <<-CONFIG
 titles:
-  post_index: Posts #{site_name}
+  post_index: Posts
 
 permalinks:
   post_index: /
@@ -389,7 +383,7 @@ CONFIG
       def post_archive_config
 <<-CONFIG
 titles:
-  post_archive: Archive #{site_name}
+  post_archive: Archive
 
 permalinks:
   post_archive: /archive/
@@ -399,7 +393,7 @@ CONFIG
       def category_index_config
 <<-CONFIG
 titles:
-  category_index: Posts in :category #{site_name}
+  category_index: Posts in :category
 
 permalinks:
   category_index: #{"/:lang" if Octopress.multilingual?}/categories/:category/
@@ -409,7 +403,7 @@ CONFIG
       def tag_index_config
 <<-CONFIG
 titles:
-  tag_index: Posts tagged with :tag #{site_name}
+  tag_index: Posts tagged with :tag
 
 permalinks:
   tag_index: #{"/:lang" if Octopress.multilingual?}/tags/:tag/
@@ -419,7 +413,7 @@ CONFIG
       def main_feed_config
 <<-CONFIG
 titles:
-  main_feed: Posts #{site_name} #{"(:lang_name)" if Octopress.multilingual?}
+  main_feed: Posts #{"(:lang_name)" if Octopress.multilingual?}
 
 permalinks:
   main_feed: #{"/:lang" if Octopress.multilingual?}/feed/
@@ -429,7 +423,7 @@ CONFIG
       def links_feed_config
 <<-CONFIG
 titles:
-  links_feed: Links #{site_name} #{"(:lang_name)" if Octopress.multilingual?}
+  links_feed: Links #{"(:lang_name)" if Octopress.multilingual?}
 
 permalinks:
   links_feed: #{"/:lang" if Octopress.multilingual?}/feed/links/
@@ -439,7 +433,7 @@ CONFIG
       def articles_feed_config
 <<-CONFIG
 titles:
-  articles_feed: Articles #{site_name} #{"(:lang_name)" if Octopress.multilingual?}
+  articles_feed: Articles #{"(:lang_name)" if Octopress.multilingual?}
 
 permalinks:
   articles_feed: #{"/:lang" if Octopress.multilingual?}/feed/articles/
@@ -449,7 +443,7 @@ CONFIG
       def category_feed_config
 <<-CONFIG
 titles:
-  category_feed: Posts in :category #{site_name} #{"(:lang_name)" if Octopress.multilingual?}
+  category_feed: Posts in :category #{"(:lang_name)" if Octopress.multilingual?}
 
 permalinks:
   category_feed: #{"/:lang" if Octopress.multilingual?}/feed/categories/:category/
@@ -459,7 +453,7 @@ CONFIG
       def tag_feed_config
 <<-CONFIG
 titles:
-  tag_feed: Posts tagged with :tag #{site_name} #{"(:lang_name)" if Octopress.multilingual?}
+  tag_feed: Posts tagged with :tag #{"(:lang_name)" if Octopress.multilingual?}
 
 permalinks:
   tag_feed: #{"/:lang" if Octopress.multilingual?}/feed/tags/:tag/

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.2.0"
+    VERSION = "1.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-27 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -299,7 +299,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A framework for creating themes and plugins for Jekyll sites