Merge pull request #2559 from daniel-beck/cleanup-changelog

Archive old changelog entries from YAML

content/_layouts/changelog.html.haml

@@ -0,0 +1,40 @@
+---
+layout: simplepage
+title: Changelog
+---
+
+%link{:href => "/css/changelog.css", :rel => "stylesheet", :type => "text/css"}/
+
+- if page.show_ratings
+  #head
+  %script{:src => "/files/rate.js", :type => "text/javascript"}
+  #ratings
+
+.w-100.text-right
+  .iconlegend
+    Legend:
+    %ul.image
+      %li.security security fix
+      %li.major.bug major bug fix
+      %li.bug bug fix
+      %li.major.rfe major enhancement
+      %li.rfe enhancement
+.w-100.text-right{:style => "margin: 10px 0;"}
+  .iconlegend
+    Community feedback:
+    %ul.feedback
+      %li.sunny no major issues
+      %li.cloudy notable issues
+      %li.storm required rollback
+.w-100.text-right{:style => "margin: 10px 0;"}
+  %a{:href => "rss.xml"}
+    %img{:src => "/images/changelog/feed-icon.png"}/
+    RSS
+
+- if page.show_ratings
+  :javascript
+    $(document).ready(function() {
+        loaddata(this);
+    });
+
+= content

content/_partials/changelog-changes.xml.haml

@@ -1,34 +1,33 @@
-- page.releases.reverse_each do |release|
-  - if Gem::Version.new(release.version) <= Gem::Version.new(page.newest_release)
-    %item
-      %title Jenkins #{release.version}
-      %link
-        #{page.changelog_url}/#v#{release.version}
-      %description
+- page.releases.reverse.select { |release| Gem::Version.new(release.version) <= Gem::Version.new(page.newest_release) }[0..page.limit-1].each do | release |
+  %item
+    %title Jenkins #{release.version}
+    %link
+      #{page.changelog_url}/#v#{release.version}
+    %description
 
-        - if release.lts_changes
-          = "<strong>Changes since #{release.lts_baseline}:</strong>".encode( { :xml => :text } )
+      - if release.lts_changes
+        = "<strong>Changes since #{release.lts_baseline}:</strong>".encode( { :xml => :text } )
+
+      = "<ul>".encode( { :xml => :text } )
+      - release.changes.each do | change |
+        = "<li>".encode( { :xml => :text } )
+        #{change.type.gsub(/\w+/, &:capitalize).gsub(/rfe/i, 'RFE')}:
+        = change.message.encode( { :xml => :text } )
+        = "</li>".encode( { :xml => :text } )
+      = "</ul>".encode( { :xml => :text } )
+
+      - if release.lts_changes
+        = "<strong>Notable changes since #{release.lts_predecessor}:</strong>".encode( { :xml => :text } )
 
         = "<ul>".encode( { :xml => :text } )
-        - release.changes.each do | change |
+        - release.lts_changes.each do | change |
           = "<li>".encode( { :xml => :text } )
           #{change.type.gsub(/\w+/, &:capitalize).gsub(/rfe/i, 'RFE')}:
           = change.message.encode( { :xml => :text } )
           = "</li>".encode( { :xml => :text } )
         = "</ul>".encode( { :xml => :text } )
-
-        - if release.lts_changes
-          = "<strong>Notable changes since #{release.lts_predecessor}:</strong>".encode( { :xml => :text } )
-
-          = "<ul>".encode( { :xml => :text } )
-          - release.lts_changes.each do | change |
-            = "<li>".encode( { :xml => :text } )
-            #{change.type.gsub(/\w+/, &:capitalize).gsub(/rfe/i, 'RFE')}:
-            = change.message.encode( { :xml => :text } )
-            = "</li>".encode( { :xml => :text } )
-          = "</ul>".encode( { :xml => :text } )
-      %guid(isPermaLink='false')
-        jenkins-#{release.version}
-      - if release.date
-        %pubDate
-          = release.date.rfc822
+    %guid(isPermaLink='false')
+      jenkins-#{release.version}
+    - if release.date
+      %pubDate
+        = release.date.rfc822

content/changelog-old.html → content/_partials/changelog-old.html

@@ -1,12 +1,3 @@
----
-layout: simplepage
-title: Changelog Archives
----
-
-<p>
-  More recent changelogs can be found in <a href="/changelog">this file</a>.
-</p>
-
 <h3 id=v2.46>What's new in 2.46 (2017/02/13)</h3>
 <ul class=image>
   <li class=bug>

content/changelog-old/index.html.haml

@@ -0,0 +1,27 @@
+---
+layout: changelog
+title: Changelog Archive
+show_ratings: false
+---
+
+%div{:style => 'margin: 10px; padding: 10px; background-color: #FFFFCE;'}
+  %b
+    This is the changelog archive.
+  Recent changelogs can be found
+  %a{:href => '/changelog/'}
+    here.
+
+.ratings
+  - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml
+  - site.changelogs[:weekly].reverse.select { |release| Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.latest) }[30..-1].each do | release |
+    %h3{:id => "v#{release.version}" }
+      = "What's new in #{release.version}"
+      - if release.date
+        = "(#{release.date})"
+    - if release.banner
+      %div{:style => 'margin: 10px; padding: 10px; background-color: #FFFFCE;'}
+        = release.banner
+    %ul.image
+      = partial('changelog-changes.html.haml', :changes => release.changes)
+
+= partial('changelog-old.html')

content/changelog-stable/index.html.haml

@@ -1,10 +1,9 @@
 ---
-layout: simplepage
+layout: changelog
 title: LTS Changelog
+show_ratings: true
 ---
 
-= partial('changelog-header.html')
-
 %div{:style => 'margin: 10px; padding: 10px; background-color: #FFFFCE;'}
   See the
   %a{:href => '/doc/upgrade-guide/'}

content/changelog-stable/rss.xml.haml

@@ -13,4 +13,4 @@
       Changelog for Jenkins LTS releases
     %lastBuildDate
       #{Date.today.rfc822}
-    = partial('changelog-changes.xml.haml', :releases => site.changelogs[:lts], :changelog_url => 'https://jenkins.io/changelog-stable/', :newest_release => site.jenkins.stable)
+    = partial('changelog-changes.xml.haml', :releases => site.changelogs[:lts], :changelog_url => 'https://jenkins.io/changelog-stable/', :newest_release => site.jenkins.stable, :limit => 0)

content/changelog/index.html.haml

@@ -1,27 +1,26 @@
 ---
-layout: simplepage
+layout: changelog
 title: Changelog
+show_ratings: true
 ---
 
-= partial('changelog-header.html')
-
 .ratings
   - # source: https://github.com/jenkins-infra/jenkins.io/blob/master/content/_data/changelogs/weekly.yml
-  - site.changelogs[:weekly].reverse_each do | release |
-    - if Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.latest)
-      %h3{:id => "v#{release.version}" }
-        = "What's new in #{release.version}"
-        - if release.date
-          = "(#{release.date})"
-      - if release.banner
-        %div{:style => 'margin: 10px; padding: 10px; background-color: #FFFFCE;'}
-          = release.banner
-      %ul.image
-        = partial('changelog-changes.html.haml', :changes => release.changes)
+  - counter = 0
+  - site.changelogs[:weekly].reverse.select { |release| Gem::Version.new(release.version) <= Gem::Version.new(site.jenkins.latest) }[0..29].each do | release |
+    %h3{:id => "v#{release.version}" }
+      = "What's new in #{release.version}"
+      - if release.date
+        = "(#{release.date})"
+    - if release.banner
+      %div{:style => 'margin: 10px; padding: 10px; background-color: #FFFFCE;'}
+        = release.banner
+    %ul.image
+      = partial('changelog-changes.html.haml', :changes => release.changes)
 
 
 %p
   %b
-    Older changelogs can be found in a
+    Changelogs of historical releases can be found
     %a{:href => '/changelog-old/'}
-      separate file
+      in the changelog archive.

content/changelog/rss.xml.haml

@@ -13,4 +13,4 @@
       Changelog for Jenkins weekly releases
     %lastBuildDate
       #{Date.today.rfc822}
-    = partial('changelog-changes.xml.haml', :releases => site.changelogs[:weekly], :changelog_url => 'https://jenkins.io/changelog/', :newest_release => site.jenkins.latest)
+    = partial('changelog-changes.xml.haml', :releases => site.changelogs[:weekly], :changelog_url => 'https://jenkins.io/changelog/', :newest_release => site.jenkins.latest, :limit => 30)