aboutsummaryrefslogtreecommitdiff
path: root/website
diff options
context:
space:
mode:
authorChristian Nüssgens <christian@nuessgens.com>2018-03-28 19:13:10 +0200
committerChristian Nüssgens <christian@nuessgens.com>2018-03-28 19:13:10 +0200
commit96cd4f5010d30aa08835f592403e6a7aceb23e46 (patch)
tree978a3672dd32d78e9eeef8caf28dba63fc7dce8c /website
parent06da0854e93df222603fcc2e51c9594c16899087 (diff)
parentaf9861ad9f7151c6d12f56ecf11d7ce10826201a (diff)
downloadlombok-96cd4f5010d30aa08835f592403e6a7aceb23e46.tar.gz
lombok-96cd4f5010d30aa08835f592403e6a7aceb23e46.tar.bz2
lombok-96cd4f5010d30aa08835f592403e6a7aceb23e46.zip
Merge remote-tracking branch 'remotes/upstream/master'
Diffstat (limited to 'website')
-rw-r--r--website/resources/js/supporters.js2
-rw-r--r--website/templates/_download-edge.html2
-rw-r--r--website/templates/_scaffold.html16
-rw-r--r--website/templates/all-versions.html2
-rw-r--r--website/templates/changelog.html2
-rw-r--r--website/templates/contributing.html2
-rw-r--r--website/templates/credits.html2
-rw-r--r--website/templates/disable-checked-exceptions.html2
-rw-r--r--website/templates/download-edge.html2
-rw-r--r--website/templates/download.html2
-rw-r--r--website/templates/features/_features.html2
-rw-r--r--website/templates/features/experimental/ExtensionMethod.html2
-rw-r--r--website/templates/features/experimental/index.html2
-rw-r--r--website/templates/features/index.html2
-rw-r--r--website/templates/order-license-info.html2
-rw-r--r--website/templates/order-license.html2
-rw-r--r--website/templates/setup/_setup.html2
-rw-r--r--website/templates/supporters.html2
18 files changed, 28 insertions, 22 deletions
diff --git a/website/resources/js/supporters.js b/website/resources/js/supporters.js
index 11f77640..07319226 100644
--- a/website/resources/js/supporters.js
+++ b/website/resources/js/supporters.js
@@ -153,6 +153,8 @@
shuffle(list);
var len = list.length;
+ if (!len) return;
+
var pos = 0;
var c = [], cd = [];
for (var i = 0; i < supPerBar; i++) {
diff --git a/website/templates/_download-edge.html b/website/templates/_download-edge.html
index b5e8af0b..e7eb856c 100644
--- a/website/templates/_download-edge.html
+++ b/website/templates/_download-edge.html
@@ -1,5 +1,5 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="snapshot">
<div class="page-header top5">
<div class="row text-center versionInfo">
<@main.h1 title="Download 'Edgy Guinea Pig' - the Lombok Cutting Edge build" />
diff --git a/website/templates/_scaffold.html b/website/templates/_scaffold.html
index 646f0247..e3096d7d 100644
--- a/website/templates/_scaffold.html
+++ b/website/templates/_scaffold.html
@@ -31,7 +31,7 @@
}
}>
-<#macro scaffold load=[]>
+<#macro scaffold load=[] title='Project Lombok'>
<!DOCTYPE html>
<html lang="en">
<head>
@@ -41,12 +41,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link href="/favicon.ico" rel="icon" type="image/x-icon" />
- <title>Project Lombok</title>
+ <title>${title}</title>
- <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.8.3/modernizr.min.js"
+ integrity="sha384-bPV3mA2eo3edoq56VzcPBmG1N1QVUfjYMxVIJPPzyFJyFZ8GFfN7Npt06Zr23qts" crossorigin="anonymous"></script>
<link href="/css/bootstrap.css" rel="stylesheet" />
- <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet" />
+ <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css"
+ integrity="sha384-CmLV3WR+cw/TcN50vJSYAs2EAzhDD77tQvGcmoZ1KEzxtpl2K5xkrpFz9N2H9ClN" crossorigin="anonymous">
<link href="/css/custom.css" rel="stylesheet" />
@@ -55,8 +57,10 @@
<link href="${ld?url_path}" rel="stylesheet" />
</#if>
</#list>
- <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
- <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/js/bootstrap.min.js"></script>
+ <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"
+ integrity="sha384-Pn+PczAsODRZ2PiGg0IheRROpP7lXO1NTIjiPo6cca8TliBvaeil42fobhzvZd74" crossorigin="anonymous"></script>
+ <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.2.0/js/bootstrap.min.js"
+ integrity="sha384-VI5+XuguQ/l3kUhh4knz7Hxptx47wpQbVRDnp8v7Vvuhzwn1PEYb/uvtH6KLxv6d" crossorigin="anonymous"></script>
<script src="/js/history.js"></script>
<script src="/js/main.js"></script>
diff --git a/website/templates/all-versions.html b/website/templates/all-versions.html
index 0c07a520..0207b351 100644
--- a/website/templates/all-versions.html
+++ b/website/templates/all-versions.html
@@ -1,5 +1,5 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="older versions">
<div class="page-header top5">
<div>
<div>
diff --git a/website/templates/changelog.html b/website/templates/changelog.html
index c02deba7..79ba7b2a 100644
--- a/website/templates/changelog.html
+++ b/website/templates/changelog.html
@@ -1,5 +1,5 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="changelog">
<div class="page-header top5">
<div class="row text-center changelog">
${changelog?no_esc}
diff --git a/website/templates/contributing.html b/website/templates/contributing.html
index 3a99c77a..16d68f32 100644
--- a/website/templates/contributing.html
+++ b/website/templates/contributing.html
@@ -1,6 +1,6 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="Contribute">
<div class="page-header top5">
<div class="row text-center">
<@main.h1 title="Contributing to Project Lombok's development" />
diff --git a/website/templates/credits.html b/website/templates/credits.html
index 925ba2d4..3390d762 100644
--- a/website/templates/credits.html
+++ b/website/templates/credits.html
@@ -1,6 +1,6 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="Credits">
<div class="page-header top5">
<div class="row text-center">
<@main.h1 title="Project Lombok - About the authors and everyone that's helped us create Project Lombok." />
diff --git a/website/templates/disable-checked-exceptions.html b/website/templates/disable-checked-exceptions.html
index ccbd0c01..4a758b11 100644
--- a/website/templates/disable-checked-exceptions.html
+++ b/website/templates/disable-checked-exceptions.html
@@ -1,6 +1,6 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="Disable Checked Exceptions">
<div class="page-header top5">
<div class="row text-center">
<h1 class="text-center">Tired of checked exceptions?</h1>
diff --git a/website/templates/download-edge.html b/website/templates/download-edge.html
index 469f1284..22044842 100644
--- a/website/templates/download-edge.html
+++ b/website/templates/download-edge.html
@@ -1,5 +1,5 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="snapshot">
<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.
diff --git a/website/templates/download.html b/website/templates/download.html
index a6b21402..3eb5787b 100644
--- a/website/templates/download.html
+++ b/website/templates/download.html
@@ -1,5 +1,5 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="Download">
<div class="page-header top5">
<div>
<div class="row page-center">
diff --git a/website/templates/features/_features.html b/website/templates/features/_features.html
index dcee152c..f602b95b 100644
--- a/website/templates/features/_features.html
+++ b/website/templates/features/_features.html
@@ -64,7 +64,7 @@
</#macro>
<#macro scaffold title logline load=[]>
- <@main.scaffold load>
+ <@main.scaffold load title>
<div class="page-header top5" id="featureContent">
<div class="row text-center">
<div class="header-group">
diff --git a/website/templates/features/experimental/ExtensionMethod.html b/website/templates/features/experimental/ExtensionMethod.html
index ca63bb2e..f1d8b084 100644
--- a/website/templates/features/experimental/ExtensionMethod.html
+++ b/website/templates/features/experimental/ExtensionMethod.html
@@ -36,7 +36,7 @@
</p><p>
Lombok does not (currently) have any runtime dependencies which means lombok does not (currently) ship with any useful extension methods so you'll have to make your own. However, here's one that might spark your imagination: <br />
<pre>public class ObjectExtensions {
- public static &lt;T&gt; or(T object, T ifNull) {
+ public static &lt;T&gt; T or(T object, T ifNull) {
return object != null ? object : ifNull;
}
}</pre><br />
diff --git a/website/templates/features/experimental/index.html b/website/templates/features/experimental/index.html
index dbd2f93c..21e8fceb 100644
--- a/website/templates/features/experimental/index.html
+++ b/website/templates/features/experimental/index.html
@@ -1,7 +1,7 @@
<#import "../../_scaffold.html" as main>
<#import "../_features.html" as f>
-<@main.scaffold>
+<@main.scaffold title="Experimental">
<div class="page-header top5">
<div class="row text-center">
<@main.h1 title="Lombok experimental features" />
diff --git a/website/templates/features/index.html b/website/templates/features/index.html
index d077ab4d..cd4c9e26 100644
--- a/website/templates/features/index.html
+++ b/website/templates/features/index.html
@@ -1,6 +1,6 @@
<#import "../_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="Stable">
<div class="page-header top5">
<div class="row text-center">
<@main.h1 title="Lombok features" />
diff --git a/website/templates/order-license-info.html b/website/templates/order-license-info.html
index 724e44f7..3572ad0f 100644
--- a/website/templates/order-license-info.html
+++ b/website/templates/order-license-info.html
@@ -1,6 +1,6 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold>
+<@main.scaffold title="Order / Donate">
<div class="page-header top5">
<div class="row text-center">
<h2>Order a professional or enterprise license</h2>
diff --git a/website/templates/order-license.html b/website/templates/order-license.html
index a364fc79..818c27f3 100644
--- a/website/templates/order-license.html
+++ b/website/templates/order-license.html
@@ -1,6 +1,6 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold load=["/js/order-license.js"]>
+<@main.scaffold load=["/js/order-license.js"] title="Order a license">
<div class="page-header top5 order-license">
<div class="row text-center">
<h2>Order a professional or enterprise license</h2>
diff --git a/website/templates/setup/_setup.html b/website/templates/setup/_setup.html
index d5a88fb7..166891ce 100644
--- a/website/templates/setup/_setup.html
+++ b/website/templates/setup/_setup.html
@@ -15,7 +15,7 @@
</#macro>
<#macro scaffold title load=[]>
- <@main.scaffold load>
+ <@main.scaffold load title>
<div class="page-header top5" id="featureContent">
<div class="row text-center">
<div class="header-group">
diff --git a/website/templates/supporters.html b/website/templates/supporters.html
index 2003a23f..9facb090 100644
--- a/website/templates/supporters.html
+++ b/website/templates/supporters.html
@@ -1,6 +1,6 @@
<#import "/_scaffold.html" as main>
-<@main.scaffold load=["js/supporters.js"]>
+<@main.scaffold load=["js/supporters.js"] title="Supporters">
<div class="page-header top5">
<div class="row text-center">
<h1>Project Lombok supporters</h1>
generated by cgit (git 2.46.0) at 2024-12-02 21:40:41 +0000