coderhs
diff --git a/‎_layouts/news.html
+14-10 b/‎_layouts/news.html
+14-10
diff --git a/‎_plugins/news_archive.rb renamed to ‎_plugins/news.rb
+41-10 b/‎_plugins/news_archive.rb renamed to ‎_plugins/news.rb
+41-10
diff --git a/‎bg/news/index.html
-17 b/‎bg/news/index.html
-17
diff --git a/‎de/news/index.html
-17 b/‎de/news/index.html
-17
diff --git a/‎en/news/index.html
-17 b/‎en/news/index.html
-17
diff --git a/‎es/news/index.html
-17 b/‎es/news/index.html
-17
diff --git a/‎fr/news/index.html
-17 b/‎fr/news/index.html
-17
diff --git a/‎id/news/index.html
-17 b/‎id/news/index.html
-17
diff --git a/‎it/news/index.html
-17 b/‎it/news/index.html
-17
diff --git a/‎ja/news/index.html
-17 b/‎ja/news/index.html
-17
diff --git a/‎ko/news/index.html
-17 b/‎ko/news/index.html
-17
diff --git a/‎pl/news/index.html
-17 b/‎pl/news/index.html
-17
diff --git a/‎pt/noticias-recentes/index.html
-17 b/‎pt/noticias-recentes/index.html
-17
diff --git a/‎tr/news/index.html
-17 b/‎tr/news/index.html
-17
diff --git a/‎zh_TW/news/index.html
-17 b/‎zh_TW/news/index.html
-17
diff --git a/‎zh_cn/news/index.html
-17 b/‎zh_cn/news/index.html
-17
@@ -6,31 +6,35 @@
   <div id="head-wrapper-1">
     <div id="head-wrapper-2">
       <div id="head">
-        {% if page.header != null %}
-        <div id="intro">
-          {{ page.header | markdownify }}
-        </div>
-        {% else %}
         <h1>{{ page.title }}</h1>
-        {% endif %}
       </div>
     </div>
   </div>
 
   <div id="content">
-    {{ content }}
+    {% for post in page.posts %}
+    <div class="post">
+      <h3><a href="{{ post.url }}">{{ post.title }}</a></h3>
+
+      {{ post.content | markdownify | strip_html | truncatewords: 25 }}
+
+      <p><a href="{{ post.url }}">Continue Reading...</a></p>
+
+      <p class="post-info">Posted by {{ post.author }} on {{ post.date | date_to_string }}</p>
+    </div>
+    {% endfor %}    
   </div>
 </div>
 <hr class="hidden-modern" />
 
 <div id="sidebar-wrapper">
   <div id="sidebar">
     <div class="navigation">
-      <h3>News Archive</h3>
+      <h3><strong>Archives By Year</strong></h3>
 
       <ul class="menu">
-      {% for post in site.categories[page.lang] %}
-      <li><a href="{{ post.url }}">{{ post.title }}</a></li>
+      {% for year in page.years %}
+      <li><a href="{{ year }}//">{{ year }} Archives</a></li>
       {% endfor %}
       </ul>
     </div>
 
@@ -1,3 +1,5 @@
+require 'date'
+
 module Jekyll
   module News
     class ArchivePage < Page
@@ -31,8 +33,10 @@ def news_dir
 
     class MonthlyArchive < ArchivePage
 
+      LAYOUT = 'news_archive_month.html'
+
       def initialize(site,base,lang,year,month,posts)
-        super(site,base,'news_archive_month.html',lang,posts)
+        super(site,base,LAYOUT,lang,posts)
 
         @year  = year
         @month = month
@@ -46,8 +50,10 @@ def initialize(site,base,lang,year,month,posts)
 
     class YearlyArchive < ArchivePage
 
+      LAYOUT = 'news_archive_year.html'
+
       def initialize(site,base,lang,year,posts)
-        super(site,base,'news_archive_year.html',lang,posts)
+        super(site,base,LAYOUT,lang,posts)
 
         @year = year
         @dir  = File.join(@dir,@year.to_s)
@@ -65,21 +71,37 @@ def initialize(site,base,lang,year,posts)
       end
 
     end
-  end
 
-  class Post
+    class Index < ArchivePage
+
+      LAYOUT = 'news.html'
+
+      MAX_POSTS = 5
+
+      def initialize(site,base,lang,posts)
+        super(site,base,LAYOUT,lang,posts)
+
+        data['title'] = 'Recent News'
+        data['years'] = posts.map { |post| post.date.year }.uniq.reverse
+        data['posts'] = posts.last(MAX_POSTS).reverse
+      end
 
-    def title
-      data['title']
     end
+  end
+
+  class Post
 
     def lang
       data['lang']
     end
 
+    def title
+      data['title']
+    end
+
   end
 
-  class GenerateNewsArchives < Generator
+  class GenerateNews < Generator
 
     safe true
     priority :low
@@ -98,15 +120,24 @@ def generate(site)
       end
 
       posts.each do |lang,years|
-        years.each do |year,months|
-          posts_for_year = months.values.flatten
+        index = News::Index.new(
+          site,
+          site.source,
+          lang,
+          years.values.map(&:values).flatten
+        )
 
+        index.render(site.layouts,site.site_payload)
+        index.write(site.dest)
+        site.pages << index
+
+        years.each do |year,months|
           yearly_archive = News::YearlyArchive.new(
             site,
             site.source,
             lang,
             year,
-            posts_for_year
+            months.values.flatten
           )
 
           yearly_archive.render(site.layouts,site.site_payload)