Styling and layout of all-versions, download, and changelog fixed/updated.

5 files changed, 99 insertions, 276 deletions

diff --git a/website/resources/css/custom.css b/website/resources/css/custom.css
index 0b2c70c9..d3022e28 100644
--- a/website/resources/css/custom.css
+++ b/website/resources/css/custom.css
@@ -1,149 +1,152 @@
-ul.dropdown-menu .header {
-    padding-left: 10px;
+html {
+	position: relative;
+	min-height: 100%;
 }
 
-div.snippet code {
-    padding: 0;
+body {
+	margin-bottom: 60px;
 }
 
-html {
-    position: relative;
-    min-height: 100%;
+ul.dropdown-menu .header {
+	padding-left: 10px;
 }
 
-body {
-    margin-bottom: 60px;
+div.snippet code {
+	padding: 0;
 }
 
 .fork-me {
-    position: fixed;
-    width: 150px;
-    height: 150px;
-    top: 0;
-    right: 0;
-    z-index: 2000;
+	position: fixed;
+	width: 150px;
+	height: 150px;
+	top: 0;
+	right: 0;
+	z-index: 2000;
+}
+
+@media (max-width: 768px) {
+	.fork-me {
+		display: none;
+	}
 }
 
 .video {
-    padding-top: 4%;
+	padding-top: 4%;
 }
 
 .name {
-    font-weight: bold;
+	font-weight: bold;
 }
 
 .bs-callout {
-    padding: 10px;
-    margin: 20px 0;
-    border: 1px solid #eee;
-    border-left-width: 5px;
-    border-radius: 3px
+	padding: 10px;
+	margin: 20px 0;
+	border: 1px solid #eee;
+	border-left-width: 5px;
+	border-radius: 3px;
 }
 
 .bs-callout h4 {
-    margin-top: 0;
-    margin-bottom: 5px
+	margin-top: 0;
+	margin-bottom: 5px;
 }
 
 .bs-callout p:last-child {
-    margin-bottom: 0
+	margin-bottom: 0;
 }
 
 .bs-callout code {
-    border-radius: 3px
+	border-radius: 3px;
 }
 
 .bs-callout + .bs-callout {
-    margin-top: -5px
+	margin-top: -5px;
 }
 
 .bs-callout-danger {
-    border-left-color: #ce4844
+	border-left-color: #ce4844;
 }
 
 .bs-callout-danger h4 {
-    color: #ce4844
+	color: #ce4844;
 }
 
 .bs-callout-warning {
-    border-left-color: #aa6708
+	border-left-color: #aa6708;
 }
 
 .bs-callout-warning h4 {
-    color: #aa6708
+	color: #aa6708;
 }
 
 .bs-callout-info {
-    border-left-color: #1b809e
+	border-left-color: #1b809e;
 }
 
 .bs-callout-info h4 {
-    color: #1b809e
+	color: #1b809e;
 }
 
 .color-swatches {
-    margin: 0 -5px;
-    overflow: hidden
+	margin: 0 -5px;
+	overflow: hidden;
 }
 
 .footer {
-    position: absolute;
-    bottom: 0;
-    height: 60px;
-    border-top: 1px solid #eee;
-    padding-top: 15px;
-}
-
-@media (max-width: 768px) {
-    .fork-me {
-        display: none;
-    }
+	position: absolute;
+	bottom: 0;
+	height: 60px;
+	border-top: 1px solid #eee;
+	padding-top: 15px;
 }
 
 h1, h2, h3 {
-    padding: 40px;
-    text-align: center;
+	padding: 40px;
+	text-align: center;
 }
 
 .page-center {
-    padding-top: 10%;
-    padding-bottom: 19%;
+	padding-top: 10%;
+	padding-bottom: 19%;
 }
 
 .page-header {
-    border-bottom: 0;
+	border-bottom: 0;
 }
 
 .header-group > h1, h2, h3 {
-    padding: 5px;
+	padding: 5px;
 }
 
 .snippet {
-    overflow: auto;
-    padding: 4px;
-    border: 1px dotted #888;
-    text-align: left;
-    width: 760px;
+	overflow: auto;
+	padding: 4px;
+	border: 1px dotted #888;
+	text-align: left;
 }
 
 .snippet font {
-    white-space: pre;
+	white-space: pre;
 }
 
 .snippet code {
-    font-size: 14px;
-    background-color: transparent;
+	font-size: 14px;
+	background-color: transparent;
 }
 
 .snippet.example {
-    margin: 8px 16px 8px 16px;
+	margin: 8px 16px 8px 16px;
 }
 
 a {
-    cursor: pointer;
+	cursor: pointer;
 }
 
 .main-section {
-    padding-left: 100px;
-    padding-right: 100px;
-}
\ No newline at end of file
+	padding-left: 100px;
+	padding-right: 100px;
+}
+
+.changelog li {
+	text-align: left;
+}
diff --git a/website/resources/js/main.js b/website/resources/js/main.js
index 4ac490d3..146dd554 100644
--- a/website/resources/js/main.js
+++ b/website/resources/js/main.js
@@ -37,6 +37,7 @@
 			var u = hs.data.urlPath;
 			if (u === "/" || u === "") u = "/main.html";
 			if (u.substring(u.length - 5) !== ".html") u += ".html";
+			if (u.substring(u.length - 8) === "all.html") u = u.substring(0, u.length - 8) + "index.html";
 			var key = toKey(u);
 			var sc = $("#" + key);
 			if (sc.length > 0) {
@@ -61,4 +62,4 @@
 	}
 
 	$(ajaxFeaturePages);
-})($);
\ No newline at end of file
+})($);
diff --git a/website/templates/all-versions.html b/website/templates/all-versions.html
index d3acd648..97592160 100644
--- a/website/templates/all-versions.html
+++ b/website/templates/all-versions.html
@@ -2,26 +2,22 @@
 <@main.scaffold>
 	<div class="page-header top5">
 		<div>
-			<div class="row page-center">
-				<div>
-					<h1 class="text-center">
-						<div class="row">
-							<icon class="fa fa-download"></icon>
-							<a>
-								Download ${version}
-							</a>
-						</div>
-						<#list linksToVersions as lnk>
-							<a href="${lnk[0]}">${lnk[1]}</a>
-						</#list>
-						<div class="row">
-							<a href="#/changelog">
-								changelog
-							</a>
-						</div>
-					</h1>
-				</div>
+			<div>
+				<h1 class="text-center">
+					<div class="row">
+						<icon class="fa fa-download"></icon>
+						<a class="currentVersion">
+							${version} [Current Version]
+						</a>
+					</div>
+				</h1>
 			</div>
+			<#list linksToVersions as lnk>
+				<div class="row">
+					<icon class="fa fa-download"></icon>
+					<a class="oldVersion" href="${lnk[0]}">${lnk[1]}</a>
+				</div>
+			</#list>
 			<div class="row">
 				<div class="text-center">
 					<h3>
@@ -31,114 +27,5 @@
 				</div>
 			</div>
 		</div>
-	
-		<!--<div class="row">-->
-	
-		<!--<table class="table table-bordered">-->
-		<!--<tr>-->
-		<!--<td class="platform">Maven,&nbsp;Ivy&nbsp;or&nbsp;Gradle</td>-->
-		<!--<td class="instruction">Lombok is in maven central. <a href="mavenrepo/index.html">More&hellip;</a>-->
-		<!--</td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Javac</td>-->
-		<!--<td class="instruction">Just put <code>lombok.jar</code> on the classpath.</td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">NetBeans</td>-->
-		<!--<td class="instruction">Just put <code>lombok.jar</code> on the classpath and enable annotation-->
-		<!--processing. <a href="setup/netbeans.html">More&hellip;</a></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Eclipse&nbsp;and&nbsp;variants</td>-->
-		<!--<td class="instruction">Run <code>lombok.jar</code> as a java app (i.e. doubleclick it, usually) to-->
-		<!--install. Also add lombok.jar to your project. <span style="font-size: 0.8em;"><em>Supported-->
-		<!--variants: Springsource Tool Suite, JBoss Developer Studio</em></span></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">IDEA&nbsp;IntelliJ</td>-->
-		<!--<td class="instruction"><a href="https://code.google.com/p/lombok-intellij-plugin/">A plugin-->
-		<!--developed by Michael Plushnikov</a> adds support for most features.-->
-		<!--</td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Javadoc</td>-->
-		<!--<td class="instruction">First delombok your code then run javadoc on the result. <a-->
-		<!--href="features/delombok.html">More&hellip;</a></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Android</td>-->
-		<!--<td class="instruction">The proper way to use lombok with android is somewhat complicated but-->
-		<!--possible. <a href="setup/android.html">More&hellip;</a></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">GWT</td>-->
-		<!--<td class="instruction">Lombok works with GWT. <a href="setup/gwt.html">More&hellip;</a></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Play!&nbsp;Framework</td>-->
-		<!--<td class="instruction">Use Aaron Freeman's <a-->
-		<!--href="https://github.com/aaronfreeman/play-lombok#readme">lombok play plugin</a>.-->
-		<!--</td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">ecj</td>-->
-		<!--<td class="instruction">Lombok works on ecj and ecj-based tools. <a-->
-		<!--href="setup/ecj.html">More&hellip;</a></td>-->
-		<!--</tr>-->
-		<!--</table>-->
-		<!--<p style="font-size: 0.9em">-->
-		<!--Or, <a href="http://code.google.com/p/projectlombok/downloads/list">download</a> a previous version of-->
-		<!--lombok.-->
-		<!--</p>-->
-		<!--</div>-->
-		<!--
-
-
-		<li><a href="downloads/lombok-1.16.4.jar">lombok-1.16.4.jar</a></li>
-+                       <li><a href="downloads/lombok-1.16.2.jar">lombok-1.16.2.jar</a></li>
-+                       <li><a href="downloads/lombok-1.16.0.jar">lombok-1.16.0.jar</a></li>
-+                       <li><a href="downloads/lombok-1.14.8.jar">lombok-1.14.8.jar</a></li>
-+                       <li><a href="downloads/lombok-1.14.6.jar">lombok-1.14.6.jar</a></li>
-+                       <li><a href="downloads/lombok-1.14.4.jar">lombok-1.14.4.jar</a></li>
-+                       <li><a href="downloads/lombok-1.14.2.jar">lombok-1.14.2.jar</a></li>
-+                       <li><a href="downloads/lombok-1.14.0.jar">lombok-1.14.0.jar</a></li>
-+                       <li><a href="downloads/lombok-1.12.6.jar">lombok-1.12.6.jar</a></li>
-+                       <li><a href="downloads/lombok-1.12.4.jar">lombok-1.12.4.jar</a></li>
-+                       <li><a href="downloads/lombok-1.12.2.jar">lombok-1.12.2.jar</a></li>
-+                       <li><a href="downloads/lombok-0.12.0.jar">lombok-0.12.0.jar</a></li>
-+                       <li><a href="downloads/lombok-0.11.8.jar">lombok-0.11.8.jar</a></li>
-+                       <li><a href="downloads/lombok-0.11.6.jar">lombok-0.11.6.jar</a></li>
-+                       <li><a href="downloads/lombok-0.11.4.jar">lombok-0.11.4.jar</a></li>
-+                       <li><a href="downloads/lombok-0.11.2.jar">lombok-0.11.2.jar</a></li>
-+                       <li><a href="downloads/lombok-0.11.0.jar">lombok-0.11.0.jar</a></li>
-+                       <li><a href="downloads/lombok-0.10.8.jar">lombok-0.10.8.jar</a></li>
-+                       <li><a href="downloads/lombok-0.10.6.jar">lombok-0.10.6.jar</a></li>
-+                       <li><a href="downloads/lombok-0.10.4.jar">lombok-0.10.4.jar</a></li>
-+                       <li><a href="downloads/lombok-0.10.2.jar">lombok-0.10.2.jar</a></li>
-+                       <li><a href="downloads/lombok-0.10.1.jar">lombok-0.10.1.jar</a></li>
-+                       <li><a href="downloads/lombok-0.10.0.jar">lombok-0.10.0.jar</a></li>
-+                       <li><a href="downloads/lombok-0.9.3.jar">lombok-0.9.3.jar</a></li>
-+                       <li><a href="downloads/lombok-0.9.2.jar">lombok-0.9.2.jar</a></li>
-+                       <li><a href="downloads/lombok-0.9.1.jar">lombok-0.9.1.jar</a></li>
-+                       <li><a href="downloads/lombok-0.9.0.jar">lombok-0.9.0.jar</a></li>
-+                       <li><a href="downloads/lombok-0.8.jar">lombok-0.8.jar</a></li>
-+                       <li><a href="downloads/lombok-0.8.5.jar">lombok-0.8.5.jar</a></li>
-+                       <li><a href="downloads/lombok-0.8.4.jar">lombok-0.8.4.jar</a></li>
-+                       <li><a href="downloads/lombok-0.8.3.jar">lombok-0.8.3.jar</a></li>
-+                       <li><a href="downloads/lombok-0.8.2.jar">lombok-0.8.2.jar</a></li>
-+                       <li><a href="downloads/lombok-0.8.1.jar">lombok-0.8.1.jar</a></li>
-+                       <li><a href="downloads/lombok-0.4.jar">lombok-0.4.jar</a></li>
-
--->
 	</div>
 </@main.scaffold>
diff --git a/website/templates/changelog.html b/website/templates/changelog.html
index 80697e70..c02deba7 100644
--- a/website/templates/changelog.html
+++ b/website/templates/changelog.html
@@ -1,11 +1,8 @@
 <#import "/_scaffold.html" as main>
 <@main.scaffold>
 	<div class="page-header top5">
-		<div class="row text-center">
-			<h1>Changelog</h1>
-		</div>
-		<div class="row text-center">
-			<h1>@CHANGELOG@</h1>
+		<div class="row text-center changelog">
+			${changelog?no_esc}
 		</div>
 	</div>
 </@main.scaffold>
diff --git a/website/templates/download.html b/website/templates/download.html
index af992c39..587ea1ab 100644
--- a/website/templates/download.html
+++ b/website/templates/download.html
@@ -7,96 +7,31 @@
 					<h1 class="text-center">
 						<div class="row">
 							<icon class="fa fa-download"></icon>
-							<a>
+							<a href="/downloads/lombok.jar">
 								Download ${version}
 							</a>
 						</div>
-						<div class="row">
-							<a href="#/changelog">
-								changelog
-							</a>
-						</div>
 					</h1>
 				</div>
+				<div class="row">
+					<a href="/changelog">
+						changelog
+					</a>
+				</div>
+				<div class="row">
+					<a href="/all-versions">
+						older versions
+					</a>
+				</div>
 			</div>
 			<div class="row">
 				<div class="text-center">
 					<h3>
-						Feeling adventurous? Download the latest <a href="lombok-edge.jar">snapshot</a>
+						Feeling adventurous? Download the latest <a href="/download-edge.html">snapshot</a>
 						release.
 					</h3>
 				</div>
 			</div>
 		</div>
-	
-		<!--<div class="row">-->
-	
-		<!--<table class="table table-bordered">-->
-		<!--<tr>-->
-		<!--<td class="platform">Maven,&nbsp;Ivy&nbsp;or&nbsp;Gradle</td>-->
-		<!--<td class="instruction">Lombok is in maven central. <a href="mavenrepo/index.html">More&hellip;</a>-->
-		<!--</td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Javac</td>-->
-		<!--<td class="instruction">Just put <code>lombok.jar</code> on the classpath.</td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">NetBeans</td>-->
-		<!--<td class="instruction">Just put <code>lombok.jar</code> on the classpath and enable annotation-->
-		<!--processing. <a href="/setup/netbeans.html">More&hellip;</a></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Eclipse&nbsp;and&nbsp;variants</td>-->
-		<!--<td class="instruction">Run <code>lombok.jar</code> as a java app (i.e. doubleclick it, usually) to-->
-		<!--install. Also add lombok.jar to your project. <span style="font-size: 0.8em;"><em>Supported-->
-		<!--variants: Springsource Tool Suite, JBoss Developer Studio</em></span></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">IDEA&nbsp;IntelliJ</td>-->
-		<!--<td class="instruction"><a href="https://github.com/mplushnikov/lombok-intellij-plugin">A plugin-->
-		<!--developed by Michael Plushnikov</a> adds support for most features.-->
-		<!--</td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Javadoc</td>-->
-		<!--<td class="instruction">First delombok your code then run javadoc on the result. <a-->
-		<!--href="/features/delombok">More&hellip;</a></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Android</td>-->
-		<!--<td class="instruction">The proper way to use lombok with android is somewhat complicated but-->
-		<!--possible. <a href="/setup/android.html">More&hellip;</a></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">GWT</td>-->
-		<!--<td class="instruction">Lombok works with GWT. <a href="setup/gwt.html">More&hellip;</a></td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">Play!&nbsp;Framework</td>-->
-		<!--<td class="instruction">Use Aaron Freeman's <a-->
-		<!--href="https://github.com/aaronfreeman/play-lombok#readme">lombok play plugin</a>.-->
-		<!--</td>-->
-		<!--</tr>-->
-	
-		<!--<tr>-->
-		<!--<td class="platform">ecj</td>-->
-		<!--<td class="instruction">Lombok works on ecj and ecj-based tools. <a-->
-		<!--href="setup/ecj.html">More&hellip;</a></td>-->
-		<!--</tr>-->
-		<!--</table>-->
-		<!--<p style="font-size: 0.9em">-->
-		<!--Or, <a href="/all-versions">download</a> a previous version of-->
-		<!--lombok.-->
-		<!--</p>-->
-		<!--</div>-->
 	</div>
 </@main.scaffold>