From 7c8f9fa445e0b21f691367210dc5fb79e79b2afa Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 22 May 2017 21:35:35 +0200
Subject: Final touches to the new website: * htaccess for ‘nice looking’ URLs.
 * download-edge overwritten upon stable releases. * fixes to the build
 system. * Added google analytics pagetracker.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 website/extra/download-edge.html          |  4 ++--
 website/extra/htaccess                    | 15 +++++++++++++++
 website/templates/_scaffold.html          |  8 ++++++++
 website/templates/download-edge.html      |  8 ++++++++
 website/templates/features/_features.html |  2 +-
 5 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 website/extra/htaccess
 create mode 100644 website/templates/download-edge.html

(limited to 'website')

diff --git a/website/extra/download-edge.html b/website/extra/download-edge.html
index 4cf794a6..e4c72dfc 100644
--- a/website/extra/download-edge.html
+++ b/website/extra/download-edge.html
@@ -35,10 +35,10 @@
 	<div class="meat download edge">
 		<h1>Download Lombok Cutting Edge build</h1>
 		<div class="versionInfo">
-			version: @VERSION-EDGE@
+			version: ${version}
 		</div>
 		<p id="changelog">
-			@CHANGELOG-EDGE@
+			${changelogEdge?no_esc}
 		</p>
 		<a href="lombok-edge.jar" id="downloadLink">
 			Download now!
diff --git a/website/extra/htaccess b/website/extra/htaccess
new file mode 100644
index 00000000..a4c3f83d
--- /dev/null
+++ b/website/extra/htaccess
@@ -0,0 +1,15 @@
+RewriteRule ^/features/all$ /features/index.html [L]
+RewriteRule ^/features/experimental/all$ /features/experimental/index.html [L]
+RewriteRule ^/features/.*\.html$ - [L]
+RewriteRule ^/features/(.*)$ /features/$1.html [L]
+RewriteRule ^/features$ /features/index.html [L]
+RewriteRule ^/features/experimental$ /features/experimental/index.html [L]
+RewriteRule ^/changelog$ /changelog.html [L]
+RewriteRule ^/?$ /main.html [L]
+RewriteRule ^/index(.html)?$ /main.html [L]
+RewriteRule ^/credits$ /credits.html [L]
+RewriteRule ^/download$ /download.html [L]
+RewriteRule ^/all(-v|V)ersions(.html)?$ /all-versions.html [L]
+RewriteRule ^/setup/.*\.html$ - [L]
+RewriteRule ^/setup/(.*) /setup/$1.html [L]
+
diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html
index f0198fa3..f20a839d 100644
--- a/website/templates/_scaffold.html
+++ b/website/templates/_scaffold.html
@@ -13,6 +13,14 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 		<meta name="google-site-verification" content="uCgX3Or3kDRGpbJ6JCsQc3Ub4JsnR5-p0itfsKAYZ_U" />
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
+		<script>
+			(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+ga('create', 'UA-9884254-1', 'auto');
+ga('send', 'pageview');
+		</script>
 		<link href="/favicon.ico" rel="icon" type="image/x-icon" />
 
 		<title>Project Lombok</title>
diff --git a/website/templates/download-edge.html b/website/templates/download-edge.html
new file mode 100644
index 00000000..469f1284
--- /dev/null
+++ b/website/templates/download-edge.html
@@ -0,0 +1,8 @@
+<#import "/_scaffold.html" as main>
+<@main.scaffold>
+	<div class="page-header top5">
+		<div class="row text-center versionInfo">
+			No edge build has been released since the last <a href="/download">stable release</a> of lombok.
+		</div>
+	</div>
+</@main.scaffold>
diff --git a/website/templates/features/_features.html b/website/templates/features/_features.html
index d7c75761..c0c63a76 100644
--- a/website/templates/features/_features.html
+++ b/website/templates/features/_features.html
@@ -70,7 +70,7 @@
 				<div class="header-group">
 					<h1>${title}</h1>
 
-					<h3>${logline}</h3>
+					<h3>${logline?no_esc}</h3>
 				</div>
 			</div>
 			<#nested>
-- 
cgit