Skip to content

Commit 355ef30

Browse files
committed
Merge branch '2wordpress' into scratch
* 2wordpress: stylesheet formatting add delimiters to denote "raw html" in output so line breaks aren't automatically converted (using Raw-HTML wordpress plugin) don't truncate taxonomy tables remove some unnecessary whitespace from article_footer template use parent/child pages in wordpress instead of using taxonomy code reorg to emulate practices from learning site import actually execute nanoc compile step initial progress on using nanoc as preprocessor and then putting content into wordpress Conflicts: content/ajax/ajax-overview.md content/assets/css/style.css
2 parents bc07343 + a898635 commit 355ef30

File tree

12 files changed

+2236
-1789
lines changed

12 files changed

+2236
-1789
lines changed

Rules

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,16 @@ class Nanoc3::Filter
7070
end
7171
end
7272

73+
class Nanoc3::Item
74+
def to_json(*a)
75+
{
76+
'title' => self[:title] || self.identifier,
77+
'chapter' => self[:chapter],
78+
'isCategory' => self[:filename].index('dex.md') != nil
79+
}.to_json(*a)
80+
end
81+
end
82+
7383
Nanoc3::Filter.register 'CodeBlocks', :code_blocks
7484

7585
preprocess do
@@ -165,9 +175,9 @@ compile '*' do
165175
if item[:homepage]
166176
layout 'home'
167177
elsif item.identifier.match /\/dex\/$/
168-
layout 'dex'
178+
layout 'wp_dex'
169179
else
170-
layout 'default'
180+
layout 'wp_stub'
171181
end
172182
end
173183

0 commit comments

Comments
 (0)