Merge pull request juusaw#14 from publicarray/master

fixes juusaw#9
pauldambra · Dec 5, 2016 · 01ced85 · 01ced85
2 parents 013139f + 6bf8c8d
commit 01ced85
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/amp.html b/amp.html
@@ -1,3 +1,6 @@
+---
+layout: amp
+---
 <!doctype html>
 <html amp lang="en">
   <head>
@@ -18,7 +21,7 @@ <h1 class="post-title">
 <span>
 {{ page.date }} - {{ page.author }}
 </span>
-{{ page.body | markdownify | amp_images }}
+{{ content | markdownify | amp_images }}
 {% capture footer %}{% include footer.html %}{% endcapture %}
 {{ footer | amp_images: false, 24, 24 }}
 </body>

diff --git a/amp_generate.rb b/amp_generate.rb
@@ -8,6 +8,7 @@ def initialize(site, base, dir, post)
       @name = 'index.html'
       self.process(@name)
       self.read_yaml(File.join(base, '_layouts'), 'amp.html')
+      self.content               = post.content
       self.data['body']          = post.content
       self.data['title']         = post.data['title']
       self.data['date']          = post.data['date']
@@ -23,10 +24,7 @@ def generate(site)
       dir = site.config['ampdir'] || 'amp'
       site.posts.docs.each do |post|
         next if post.data['skip_amp'] == true
-        index = AmpPost.new(site, site.source, File.join(dir, post.id), post)
-        index.render(site.layouts, site.site_payload)
-        index.write(site.dest)
-        site.pages << index
+        site.pages << AmpPost.new(site, site.source, File.join(dir, post.id), post)
       end
     end
   end