From 52930399452223b34265ff4acf16b7619be9c72c Mon Sep 17 00:00:00 2001 From: Joe-Brady Date: Thu, 23 Mar 2017 22:22:08 +0000 Subject: [PATCH] Create Handlebars templating system for HTML --- CONTRIBUTING.md | 29 +++- README.md | 8 +- about.html | 154 +++++++++++++++++ dist/css/styles.css | 15 ++ dist/css/styles.min.css | 2 +- getinvolved.html | 42 +++-- gulpfile.js | 27 ++- index.html | 123 +++++++------ installation.html | 133 +++++++------- nightly.html | 84 ++++----- package.json | 7 +- releases.html | 200 +++++++++++----------- src/handlebars/about.handlebars | 97 +++++++++++ src/handlebars/getinvolved.handlebars | 15 ++ src/handlebars/index.handlebars | 57 ++++++ src/handlebars/installation.handlebars | 62 +++++++ src/handlebars/nightly.handlebars | 39 +++++ src/handlebars/partials/footer.handlebars | 18 ++ src/handlebars/partials/header.handlebars | 41 +++++ src/handlebars/releases.handlebars | 111 ++++++++++++ src/handlebars/support.handlebars | 37 ++++ src/scss/styles-8-about.scss | 22 +++ support.html | 83 ++++----- 23 files changed, 1062 insertions(+), 344 deletions(-) create mode 100644 about.html create mode 100644 src/handlebars/about.handlebars create mode 100644 src/handlebars/getinvolved.handlebars create mode 100644 src/handlebars/index.handlebars create mode 100644 src/handlebars/installation.handlebars create mode 100644 src/handlebars/nightly.handlebars create mode 100644 src/handlebars/partials/footer.handlebars create mode 100644 src/handlebars/partials/header.handlebars create mode 100644 src/handlebars/releases.handlebars create mode 100644 src/handlebars/support.handlebars create mode 100644 src/scss/styles-8-about.scss diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7ec28e27..a3fa0135 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,19 +14,38 @@ npm install ``` -3. Start the live compile / concat / minify scripts +3. Start the auto-build scripts ``` npm start ``` -4. Make your changes in the root and `/src` directories. -Please note that there are some files, notably `api.js`, that appear only in `/dist` and should be edited there. +4. Make changes **only** in the `/src` directory + > Please note that `api.js` is an exception to this rule: it appears only in `/dist`, and should be edited there. + +5. Open `/index.html` in any browser, and refresh the page after saving your changes to `/src`. --- ## Contribution guidelines +### HTML (Handlebars) pt.1 +* **Do not** edit the `.html` files in the root directory. They are created and updated by the build process. +* Instead, edit the `.handlebars` files in the `/src/handlebars` directory. +* 'Handlebars' files should only include the `
` element, containing the page's content, and `{{> header}}` / `{{> footer }}` tags. + +### HTML (Handlebars) pt.2 (creating a new .handlebars file) +* The header, footer, metadata, and more, are contained within 'partials' (`/src/handlebars/partials`). +* This way, repeated content (e.g. header and footer) only has to be maintained in one place. +* Any new pages should have the header and footer partials inserted above and below the `
` tags respectively. +* When you insert the header partial into a `.handlebars` file, you should pass in a variable for the page title, e.g. `{{> header title='Releases - AdoptOpenJDK' }}`. +* When you insert the footer partial into a `.handlebars` file, you can pass in a variable for any page-specific JavaScript that you have written to be run 'on page load', e.g. `{{> footer script='' }}`. See the 'JS' section below for details on this system. +* If you are unsure, it is best to begin by copying an existing `.handlebars` file, and deleting the content between the `
` tags. + +### Menu system +* The menu contents can be changed in `/src/handlebars/partials/header.handlebars`. +* Add or update the entries within ``. + ### SCSS * Only use the units `rem` and `%`. __Do not__ use `em` or `px`. * Try to use only the colours that exist as variables at the top of each stylesheet, such as `$mainblue`. @@ -38,9 +57,9 @@ Please note that there are some files, notably `api.js`, that appear only in `/d ### JS * Use `global.js` for global JavaScript functions. * Use individual `.js` files for functions that are specific to a page, such as `nightly.js`. For any functions that should happen 'on page load', call them from within the root function for that page, e.g. `onNightlyLoad(){...}`. -* If you create a new `.html` page that requires new JavaScript functions: +* If you create a new `.handlebars` file that requires new JavaScript functions: 1. Create a new `.js` file inside `/src/js` to match the page's name. 2. Re-run `npm start` to add this new file to the `/dist` directory. 3. Write a new root function in this file such as `function onNightlyLoad(){...}`. 4. Any functions that you want to run after the page has loaded should be called from here. - 5. Add a ``. + 5. Refer to the 'HTML (Handlebars)' section above for guidance on how to call this root function. diff --git a/README.md b/README.md index 35bf733f..738c561f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,14 @@ [![Build Status](https://travis-ci.org/AdoptOpenJDK/openjdk-website.svg?branch=master)](https://travis-ci.org/AdoptOpenJDK/openjdk-website) -# Readme +# README -## https://openjdk.github.io/openjdk-website/index +This repo contains the source code for http://www.adoptopenjdk.net, which itself is the custom domain ontop of GitHub Pages for this repo. + +# Developers See the [Contribution Guidelines](CONTRIBUTING.md). +When pull requests are reviewed, accepted and merged they are automatically deployed to the live site (as part of the GitHub Pages mechanism). + --- ## Using the releases API _(work in progress)_ diff --git a/about.html b/about.html new file mode 100644 index 00000000..8e3b8ec9 --- /dev/null +++ b/about.html @@ -0,0 +1,154 @@ + + + + + + + About - AdoptOpenJDK + + + + + + + + + + + + + + + + +
+ +

About

+ +
+ + +
+

About AdoptOpenJDK - GetOpenJDK

+

+ This initiative came about following a discussion about the general lack of an open and reproducible build & test system for the OpenJDK source + across multiple platforms. Practically, it's a reboot of the work that has already been done for a while in the OpenJDK project producing binaries + for developers and end users. +

+ +

+ The intention is to provide binaries and hardware access for all of the major platforms, for the purposes of: +

    +
  • Research and Development by academics, researchers and enthusiasts.
  • +
  • An open, common, audited, build infrastructure for vendors to use (if they wish).
  • +
  • Providing binaries for bleeding edge early adopters.
  • +
  • Providing a place to try out build infrastructure ideas that might one day be moved to OpenJDK proper.
  • +
+

+ +

+ Although we will be making the binaries to the highest quality possible via jtreg, jcov test coverage and possibly other donated test + suites. It is not the intention that the binaries produced will be professionally supported. See + Support for details. +

+ +

+ There may be some areas of overlap with other past/present efforts, but that's OK. We expect any duplication to converge in due course and have + started working with other platform specific OpenJDK build efforts. +

+ +

+ Discussions will take place on the Mailing List, or via + the Github issues; and consensus recorded on this project website or the appropriate GitHub repo wiki as appropriate. +

+
+ +
+

Supported Forests

+

+ We'll start with jdk8u (effectively Java 8) with test coverage from the open jtreg tests, providing jcov test coverage reports. Later on other popular + forests such as jdk9, jdk10, valhalla, shenandoah etc will be added. +

+
+ +
+

Supported Platforms

+

+ We currently have Linux x64 and Mac OS X and are looking to rapidly add the other common Linux variants + Windows and Solaris. We envisage some + strong collaboration can form here with IcedTea and other specific platform efforts! +

+
+ +
+

About the AdoptOpenJDK Community

+

+ AdoptOpenJDK is a community of Java user group members, Java developers, Vendors who are + advocates of OpenJDK, the open source project which forms the basis of the Java™ programming language and + platform. +

+

+ Part of the group's activities occur at the Adoption Group on OpenJDK proper where you + can also join the Mailing List. +

+
+ +
+

License

+

+ Build scripts and other code to product the binaries, the website and other build infrastructure are licensed under + Apache License, Version 2.0. + OpenJDK code itself is licensed under GPL v2 with Classpath Exception. +

+
+ + + +
+ +
+ + + + + + + + diff --git a/dist/css/styles.css b/dist/css/styles.css index 1bc0fb56..09c30baf 100644 --- a/dist/css/styles.css +++ b/dist/css/styles.css @@ -558,3 +558,18 @@ main .support { max-width: 40rem; margin: 0 auto; width: 80%; } + +main.about p, main.about ul { + max-width: 40rem; + margin: 1rem auto; + width: 80%; + text-align: left; + line-height: 1.8rem; } + +main.about a { + text-decoration: none; + color: #3D70B2; } + +main.about a:hover { + text-decoration: underline; + color: #3D70B2; } diff --git a/dist/css/styles.min.css b/dist/css/styles.min.css index ea88e627..dcb4b314 100644 --- a/dist/css/styles.min.css +++ b/dist/css/styles.min.css @@ -1 +1 @@ -code,pre{box-sizing:border-box;overflow:auto}#menu-content a,.a-button,.no-underline,main .intro a{text-decoration:none}#menu-content,#nightly-list,code,pre{overflow:auto}html{font:16px "Open Sans",helvetica,sans-serif;font-weight:100}button,h1,h2,h3,h4,input,optgroup,select,textarea{font-family:"Open Sans",helvetica,sans-serif;font-weight:100}@media all and (max-width:800px){html{font-size:15px}}@media all and (max-width:500px){html{font-size:14px}}.blue-bg{background-color:#152935!important;color:#F5F5F5!important}#menu-header,.grey-bg{background-color:#F5F5F5}.light-text{color:#F5F5F5}.grey-bg{color:#152935}.dark-link,.dark-link:visited,a,a:visited{color:#152935;cursor:pointer}.dark-link:hover,a:hover{color:#3D70B2}.light-link,.light-link:visited{color:#F5F5F5}#menu-close:hover,.light-link:hover{color:#3D70B2}.full-width{width:100%}.bold{font-weight:700}.hide{display:none!important}.invisible{visibility:hidden}.block{display:block}.inline-block{display:inline-block}.zero-margin{margin:0}.margin-auto{margin:0 auto}.margin-bottom{margin-bottom:4rem}.large-title{font-size:3rem;margin-top:0}.align-left{text-align:left}#error-container,#menu-close,#search-error,.align-center,footer,input,main{text-align:center}.vertical-align-top{vertical-align:top}.vertically-center-child{position:absolute;top:50%;transform:translateY(-50%)}.vertically-center-parent,nav{position:relative}input{padding:.5rem;min-width:12rem;margin-top:1rem}#logo{margin:2rem auto;font-size:1.4rem;display:table;cursor:pointer;color:#F5F5F5}#menu-button,#menu-close{font-size:2rem;cursor:pointer}#logo div{display:table-cell;vertical-align:middle}#logo img{width:2rem;margin-right:.6rem;transform:translateY(.1rem)}#menu-button{color:#F5F5F5;position:absolute;margin-left:2rem;line-height:1;padding:2rem 1rem;top:50%;transform:translateY(-50%)}#menu-button:hover{color:#dadada}#menu-container{position:fixed;background-color:#e6e6e6;z-index:100;width:90%;max-width:16rem;padding:0 2rem 2rem;top:0;left:0;height:100%;animation-duration:.25s}#menu-header{width:20rem;transform:translateX(-2rem)}#menu-close{padding:1.98rem;display:block}#menu-content{height:80%;margin:2rem 0}#menu-content a{display:block;padding:.8rem 0}#menu-content p{border-bottom:1px solid #dadada;margin:0}body,html{max-width:100%;overflow-x:hidden}main{padding:2rem 2rem 5rem}.home-main{padding:3rem 2rem 5rem}.blue-button,.grey-button{border-radius:.2rem;padding:0 1.5rem;line-height:2rem;font-size:1rem;margin:.2rem;display:inline-block;cursor:pointer}#error-container{color:red}.grey-button{background-color:#dadada;color:#152935!important}.grey-button:hover{background-color:#e6e6e6;color:#152935!important}.blue-button{background-color:#3D70B2;color:#F5F5F5!important}.blue-button:hover{background-color:#447cc3;color:#F5F5F5!important}#search-error{margin-top:2rem}.github-logo{width:3rem;margin:0 auto}#installation-container{max-width:50rem;margin:auto;text-align:left}#installation-container li{margin-top:2rem}pre{background-color:#e8e8e8;border-radius:.5rem;box-shadow:#c3c3c3 0 2.5px 0 0;color:#585858;font-family:Consolas,monospace;padding:1rem;white-space:pre-wrap}code{white-space:pre}footer{padding:2rem;font-size:.7rem}footer p{max-width:20rem;margin:auto}main .intro{max-width:40rem;margin-bottom:1rem;margin-left:auto;margin-right:auto;width:80%;line-height:1.8rem}main .intro i{font-size:1.8rem;margin-right:.5rem;transform:translateY(.3rem)}main .intro a{color:#3D70B2}main .intro a:hover{text-decoration:underline;color:#3D70B2}#loading-index{position:absolute;left:50%;transform:translate(-50%,.1rem)}.dl-container{margin:0 auto}a.dl-button{background-color:#3D70B2;color:#F5F5F5;border-radius:.2rem;width:20rem;line-height:5rem;font-size:1.5rem;margin:1.2rem .6rem 0;cursor:pointer;display:inline-block}#dl-text{margin-top:2.5rem;margin-bottom:0}a.dl-button #dl-version{transform:translateY(-.6rem)}a.dl-button .dl-description{font-size:.8rem;position:absolute;left:50%;transform:translate(-50%,-3.8rem)}a.dl-button:hover{background-color:#447cc3;color:#F5F5F5}a.dl-thin-button{line-height:2rem;font-size:1rem;background-color:#dadada;color:#152935;display:block;margin:1rem auto}a.dl-thin-button:hover{background-color:#e6e6e6;color:#152935}.home-links{padding:0 1rem}.nightly-container>td,th{padding:.4rem 1rem}.divider{margin:0 .2rem}#table-parent{margin:0 auto}#nightly-list{width:90%;max-width:80rem;margin:2rem auto auto;text-align:left}.nightly-container{white-space:nowrap;color:#152935;border:.1rem solid #F5F5F5}.nightly-container div{display:inline-block}.nightly-container>td:nth-child(odd){background-color:#d0d0d0}.nightly-container>td:nth-child(even){background-color:#e2e2e2}th{white-space:nowrap;background-color:#152935;color:#F5F5F5}#nightly-table th:nth-child(3),#nightly-table tr td:nth-child(3){display:none}#latest-build-name{font-size:3rem;font-weight:700;margin:0}#latest-intro{margin:1rem 0}#latest-metadata-table{color:#F5F5F5;margin:0 auto}#latest-metadata-table td{padding:.5rem 1.5rem}#latest-metadata-table td:first-child{border-radius:.3rem 0 0 .3rem}#latest-metadata-table td:last-child{border-radius:0 .3rem .3rem 0}#latest-metadata-table td:nth-child(even){background-color:#1F2F4E}#latest-metadata-table td:nth-child(odd){background-color:#182336}.latest-block{display:inline-block;vertical-align:top;margin:3rem 2.5rem 1rem}.latest-platform{font-size:1.5rem}.latest-platform img{height:3.5rem}a.latest-download-button{background-color:#3D70B2;display:block;color:#F5F5F5;border-radius:.2rem;min-width:14rem;line-height:2.5rem;cursor:pointer;margin:1rem 0}a.latest-download-button:hover{background-color:#447cc3;color:#F5F5F5}.latest-details{font-size:.8rem}.small-dl-text{font-size:.7rem;line-height:1.2rem;transform:translateY(-.4rem);color:rgba(255,255,255,.64)}.archive-container{margin:3rem 0;height:14rem;font-size:.8rem}.archive-details,.archive-downloads,.archive-header{padding:0 2%;background-color:#fff;display:inline-block;vertical-align:top;height:100%;width:16rem;margin:0 .1rem}.archive-header{text-align:center;padding:0;width:18rem}.archive-header h1{margin-top:0}.archive-platform-block{margin:1rem 0}.archive-platform-block a,.archive-platform-block div{font-size:.8rem}.archive-platform-block .grey-button{margin-right:1rem;min-width:5rem}.archive-details div{padding:.5rem 0}@media all and (max-width:1100px){.latest-download-button{min-width:0}.archive-downloads{width:14rem}.archive-header{width:16rem}}@media all and (max-width:950px){.vertically-center-parent{position:initial}.vertically-center-child{position:initial;top:initial;transform:initial}.archive-container{height:initial}.archive-container>div{padding:1rem;display:block;margin:auto;width:80%}.archive-details,.archive-platform-block{text-align:center}.archive-platform-block>div:first-child{display:inline-block;margin-right:.5rem}.archive-container .archive-details,.archive-container .archive-downloads{padding:.1rem 1rem}}@media all and (max-width:800px){#latest-metadata-table td{display:inline-block;width:80%;border-radius:0!important}.latest-download-button{min-width:0}#latest-build-name,.large-title{font-size:2rem}}@media all and (max-width:650px){#latest-build-name,#menu-button{font-size:1.5rem}main{padding:2rem 1rem 5rem}main .intro{width:100%}a.dl-button{width:100%;margin:1.2rem auto 0}a.dl-button .dl-description{transform:translate(-50%,-3.8rem);left:50%}.home-links{display:block}#menu-button{margin-left:0;padding:2.2rem 1rem}.latest-block{display:inline-block;vertical-align:top;margin:2rem 0 1rem;width:85%}input{min-width:0;max-width:80%}.archive-container>div{width:90%}}main .support{max-width:40rem;margin:0 auto;width:80%} \ No newline at end of file +code,pre{box-sizing:border-box;overflow:auto}#menu-content a,.a-button,.no-underline,main .intro a{text-decoration:none}#menu-content,#nightly-list,code,pre{overflow:auto}html{font:16px "Open Sans",helvetica,sans-serif;font-weight:100}button,h1,h2,h3,h4,input,optgroup,select,textarea{font-family:"Open Sans",helvetica,sans-serif;font-weight:100}@media all and (max-width:800px){html{font-size:15px}}@media all and (max-width:500px){html{font-size:14px}}.blue-bg{background-color:#152935!important;color:#F5F5F5!important}#menu-header,.grey-bg{background-color:#F5F5F5}.light-text{color:#F5F5F5}.grey-bg{color:#152935}.dark-link,.dark-link:visited,a,a:visited{color:#152935;cursor:pointer}.dark-link:hover,a:hover{color:#3D70B2}.light-link,.light-link:visited{color:#F5F5F5}#menu-close:hover,.light-link:hover{color:#3D70B2}.full-width{width:100%}.bold{font-weight:700}.hide{display:none!important}.invisible{visibility:hidden}.block{display:block}.inline-block{display:inline-block}.zero-margin{margin:0}.margin-auto{margin:0 auto}.margin-bottom{margin-bottom:4rem}.large-title{font-size:3rem;margin-top:0}.align-left{text-align:left}#error-container,#menu-close,#search-error,.align-center,footer,input,main{text-align:center}.vertical-align-top{vertical-align:top}.vertically-center-child{position:absolute;top:50%;transform:translateY(-50%)}.vertically-center-parent,nav{position:relative}input{padding:.5rem;min-width:12rem;margin-top:1rem}#logo{margin:2rem auto;font-size:1.4rem;display:table;cursor:pointer;color:#F5F5F5}#menu-button,#menu-close{font-size:2rem;cursor:pointer}#logo div{display:table-cell;vertical-align:middle}#logo img{width:2rem;margin-right:.6rem;transform:translateY(.1rem)}#menu-button{color:#F5F5F5;position:absolute;margin-left:2rem;line-height:1;padding:2rem 1rem;top:50%;transform:translateY(-50%)}#menu-button:hover{color:#dadada}#menu-container{position:fixed;background-color:#e6e6e6;z-index:100;width:90%;max-width:16rem;padding:0 2rem 2rem;top:0;left:0;height:100%;animation-duration:.25s}#menu-header{width:20rem;transform:translateX(-2rem)}#menu-close{padding:1.98rem;display:block}#menu-content{height:80%;margin:2rem 0}#menu-content a{display:block;padding:.8rem 0}#menu-content p{border-bottom:1px solid #dadada;margin:0}body,html{max-width:100%;overflow-x:hidden}main{padding:2rem 2rem 5rem}.home-main{padding:3rem 2rem 5rem}.blue-button,.grey-button{border-radius:.2rem;padding:0 1.5rem;line-height:2rem;font-size:1rem;margin:.2rem;display:inline-block;cursor:pointer}#error-container{color:red}.grey-button{background-color:#dadada;color:#152935!important}.grey-button:hover{background-color:#e6e6e6;color:#152935!important}.blue-button{background-color:#3D70B2;color:#F5F5F5!important}.blue-button:hover{background-color:#447cc3;color:#F5F5F5!important}#search-error{margin-top:2rem}.github-logo{width:3rem;margin:0 auto}#installation-container{max-width:50rem;margin:auto;text-align:left}#installation-container li{margin-top:2rem}pre{background-color:#e8e8e8;border-radius:.5rem;box-shadow:#c3c3c3 0 2.5px 0 0;color:#585858;font-family:Consolas,monospace;padding:1rem;white-space:pre-wrap}code{white-space:pre}footer{padding:2rem;font-size:.7rem}footer p{max-width:20rem;margin:auto}main .intro{max-width:40rem;margin-bottom:1rem;margin-left:auto;margin-right:auto;width:80%;line-height:1.8rem}main .intro i{font-size:1.8rem;margin-right:.5rem;transform:translateY(.3rem)}main .intro a{color:#3D70B2}main .intro a:hover{text-decoration:underline;color:#3D70B2}#loading-index{position:absolute;left:50%;transform:translate(-50%,.1rem)}.dl-container{margin:0 auto}a.dl-button{background-color:#3D70B2;color:#F5F5F5;border-radius:.2rem;width:20rem;line-height:5rem;font-size:1.5rem;margin:1.2rem .6rem 0;cursor:pointer;display:inline-block}#dl-text{margin-top:2.5rem;margin-bottom:0}a.dl-button #dl-version{transform:translateY(-.6rem)}a.dl-button .dl-description{font-size:.8rem;position:absolute;left:50%;transform:translate(-50%,-3.8rem)}a.dl-button:hover{background-color:#447cc3;color:#F5F5F5}a.dl-thin-button{line-height:2rem;font-size:1rem;background-color:#dadada;color:#152935;display:block;margin:1rem auto}a.dl-thin-button:hover{background-color:#e6e6e6;color:#152935}.home-links{padding:0 1rem}.nightly-container>td,th{padding:.4rem 1rem}.divider{margin:0 .2rem}#table-parent{margin:0 auto}#nightly-list{width:90%;max-width:80rem;margin:2rem auto auto;text-align:left}.nightly-container{white-space:nowrap;color:#152935;border:.1rem solid #F5F5F5}.nightly-container div{display:inline-block}.nightly-container>td:nth-child(odd){background-color:#d0d0d0}.nightly-container>td:nth-child(even){background-color:#e2e2e2}th{white-space:nowrap;background-color:#152935;color:#F5F5F5}#nightly-table th:nth-child(3),#nightly-table tr td:nth-child(3){display:none}#latest-build-name{font-size:3rem;font-weight:700;margin:0}#latest-intro{margin:1rem 0}#latest-metadata-table{color:#F5F5F5;margin:0 auto}#latest-metadata-table td{padding:.5rem 1.5rem}#latest-metadata-table td:first-child{border-radius:.3rem 0 0 .3rem}#latest-metadata-table td:last-child{border-radius:0 .3rem .3rem 0}#latest-metadata-table td:nth-child(even){background-color:#1F2F4E}#latest-metadata-table td:nth-child(odd){background-color:#182336}.latest-block{display:inline-block;vertical-align:top;margin:3rem 2.5rem 1rem}.latest-platform{font-size:1.5rem}.latest-platform img{height:3.5rem}a.latest-download-button{background-color:#3D70B2;display:block;color:#F5F5F5;border-radius:.2rem;min-width:14rem;line-height:2.5rem;cursor:pointer;margin:1rem 0}a.latest-download-button:hover{background-color:#447cc3;color:#F5F5F5}.latest-details{font-size:.8rem}.small-dl-text{font-size:.7rem;line-height:1.2rem;transform:translateY(-.4rem);color:rgba(255,255,255,.64)}.archive-container{margin:3rem 0;height:14rem;font-size:.8rem}.archive-details,.archive-downloads,.archive-header{padding:0 2%;background-color:#fff;display:inline-block;vertical-align:top;height:100%;width:16rem;margin:0 .1rem}.archive-header{text-align:center;padding:0;width:18rem}.archive-header h1{margin-top:0}.archive-platform-block{margin:1rem 0}.archive-platform-block a,.archive-platform-block div{font-size:.8rem}.archive-platform-block .grey-button{margin-right:1rem;min-width:5rem}.archive-details div{padding:.5rem 0}@media all and (max-width:1100px){.latest-download-button{min-width:0}.archive-downloads{width:14rem}.archive-header{width:16rem}}@media all and (max-width:950px){.vertically-center-parent{position:initial}.vertically-center-child{position:initial;top:initial;transform:initial}.archive-container{height:initial}.archive-container>div{padding:1rem;display:block;margin:auto;width:80%}.archive-details,.archive-platform-block{text-align:center}.archive-platform-block>div:first-child{display:inline-block;margin-right:.5rem}.archive-container .archive-details,.archive-container .archive-downloads{padding:.1rem 1rem}}@media all and (max-width:800px){#latest-metadata-table td{display:inline-block;width:80%;border-radius:0!important}.latest-download-button{min-width:0}#latest-build-name,.large-title{font-size:2rem}}@media all and (max-width:650px){#latest-build-name,#menu-button{font-size:1.5rem}main{padding:2rem 1rem 5rem}main .intro{width:100%}a.dl-button{width:100%;margin:1.2rem auto 0}a.dl-button .dl-description{transform:translate(-50%,-3.8rem);left:50%}.home-links{display:block}#menu-button{margin-left:0;padding:2.2rem 1rem}.latest-block{display:inline-block;vertical-align:top;margin:2rem 0 1rem;width:85%}input{min-width:0;max-width:80%}.archive-container>div{width:90%}}main .support{max-width:40rem;margin:0 auto;width:80%}main.about p,main.about ul{max-width:40rem;margin:1rem auto;width:80%;text-align:left;line-height:1.8rem}main.about a{text-decoration:none;color:#3D70B2}main.about a:hover{text-decoration:underline;color:#3D70B2} \ No newline at end of file diff --git a/getinvolved.html b/getinvolved.html index 6d413e88..c79a5db9 100644 --- a/getinvolved.html +++ b/getinvolved.html @@ -28,6 +28,7 @@

Installation

Get involved

Support

+ @@ -39,30 +40,33 @@ -
+
-

Get involved

+

Get involved

-

See the build wiki on GitHub

-

Having issues? Report them here

+

Join the mailing list

+

See the build wiki on GitHub

+

Having issues? Report them here

- + +
-
- - + + + + diff --git a/gulpfile.js b/gulpfile.js index b434347a..4a55834c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -7,17 +7,36 @@ const sass = require('gulp-sass'); const uglify = require('gulp-uglify'); const prefix = require('gulp-autoprefixer'); const imagemin = require('gulp-imagemin'); +const handlebars = require('gulp-compile-handlebars'); // default task -gulp.task('default', ['scripts','styles','images','watch']); +gulp.task('default', ['handlebars', 'scripts','styles','images','watch']); // watch task -gulp.task('watch', function(){ +gulp.task('watch', function() { + gulp.watch(['./src/handlebars/partials/*.handlebars', './src/handlebars/*.handlebars'], ['handlebars']); gulp.watch('./src/js/*.js', ['scripts']); gulp.watch('./src/scss/*.scss', ['styles']); gulp.watch(['./src/assets/*.jp*', './src/assets/*.png', './src/assets/*.gif'], ['images']); }); +// Handlebars HTML build task +gulp.task('handlebars', function () { + var templateData = { + }, + options = { + ignorePartials: true, // ignores unknown partials in the template, defaults to false + batch : ['./src/handlebars/partials'] + } + return gulp.src('./src/handlebars/*.handlebars') + .pipe(handlebars(templateData, options)) + .pipe(rename({ + extname: '.html' + })) + .pipe(gulp.dest('./')); +}); + + // scripts task gulp.task('scripts', function() { return gulp.src('./src/js/*.js') @@ -31,7 +50,7 @@ gulp.task('scripts', function() { }); // styles task -gulp.task('styles', function(){ +gulp.task('styles', function() { return gulp.src('./src/scss/*.scss') .pipe(sass()) .pipe(prefix('last 2 versions')) @@ -45,7 +64,7 @@ gulp.task('styles', function(){ }); // images task -gulp.task('images', function(){ +gulp.task('images', function() { return gulp.src(['./src/assets/*.jp*', './src/assets/*.png', './src/assets/*.gif']) .pipe(imagemin()) .pipe(gulp.dest('./dist/assets/')) diff --git a/index.html b/index.html index 0a1d2658..6279f126 100644 --- a/index.html +++ b/index.html @@ -28,6 +28,7 @@

Installation

Get involved

Support

+ @@ -39,79 +40,75 @@ -
-

- Java™ is the world's leading programming language and platform. The code for Java is open source and available at - OpenJDK™. AdoptOpenJDK provides prebuilt OpenJDK binaries - from a fully open source set of build scripts and infrastructure. -

-

- AdoptOpenJDK binaries are not professionally supported, see Support for details. -

+
+

+ Java™ is the world's leading programming language and platform. The code for Java is open source and available at + OpenJDK™. AdoptOpenJDK provides prebuilt OpenJDK binaries + from a fully open source set of build scripts and infrastructure. +

+

+ AdoptOpenJDK binaries are not professionally supported, see Support for details. +

- - + -
+
- + + + - - diff --git a/installation.html b/installation.html index bed27251..575d1c9d 100644 --- a/installation.html +++ b/installation.html @@ -4,7 +4,7 @@ - AdoptOpenJDK - Installation + Installation - AdoptOpenJDK @@ -28,6 +28,7 @@

Installation

Get involved

Support

+ @@ -39,78 +40,80 @@ -
+
-

Installation

+

Installation

- + -
-
-

Linux and macOS installation

-
    -
  1. Download the latest tar.gz from the Latest release page to a directory that will not move or be deleted.
  2. -
  3. - Using Terminal, navigate to the location of this tar.gz: -
    cd <path/to/your/directory>
    -
  4. -
  5. - Extract the tar.gz. You can use the following command: -
    tar -xf <filename>.tar.gz
    -
  6. -
  7. - Add this version of Java™ to your PATH: -
    export PATH=$PWD/j2sdk-image/bin:$PATH
    -
  8. -
  9. - Check that it has installed correctly: -
    java -version
    -
  10. -
-
- -
-

Windows installation

-
    -
  1. Download the latest .zip from the Latest release page to a directory that will not move or be deleted.
  2. -
  3. - Using the command prompt, navigate to the location of this .zip: -
    cd <path\to\your\directory>
    -
  4. -
  5. - Extract the .zip. You can use the following command: -
    unzip <filename>.zip
    -
  6. -
  7. - Add this version of Java™ to your PATH: -
    set PATH=%cd%\j2sdk-image\bin;%PATH%
    -
  8. -
  9. - Check that it has installed correctly: -
    java -version
    -
  10. -
-
+
+
+

Linux and macOS installation

+
    +
  1. Download the latest tar.gz from the Latest release page to a directory that will not move or be deleted.
  2. +
  3. + Using Terminal, navigate to the location of this tar.gz: +
    cd <path/to/your/directory>
    +
  4. +
  5. + Extract the tar.gz. You can use the following command: +
    tar -xf <filename>.tar.gz
    +
  6. +
  7. + Add this version of Java™ to your PATH: +
    export PATH=$PWD/j2sdk-image/bin:$PATH
    +
  8. +
  9. + Check that it has installed correctly: +
    java -version
    +
  10. +
+
+
+

Windows installation

+
    +
  1. Download the latest .zip from the Latest release page to a directory that will not move or be deleted.
  2. +
  3. + Using the command prompt, navigate to the location of this .zip: +
    cd <path\to\your\directory>
    +
  4. +
  5. + Extract the .zip. You can use the following command: +
    unzip <filename>.zip
    +
  6. +
  7. + Add this version of Java™ to your PATH: +
    set PATH=%cd%\j2sdk-image\bin;%PATH%
    +
  8. +
  9. + Check that it has installed correctly: +
    java -version
    +
  10. +
-
+ -
+ +
+
+ + +

GitHub build repo

-

Java and OpenJDK are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

-
+ + +

Having issues? 

+
+

Java and OpenJDK are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

+ + + + - diff --git a/nightly.html b/nightly.html index 3d819fcf..eda08613 100644 --- a/nightly.html +++ b/nightly.html @@ -12,7 +12,6 @@ - @@ -29,6 +28,7 @@

Installation

Get involved

Support

+ @@ -40,57 +40,57 @@ -
-
+
+
-

Nightly builds

+

Nightly builds

- -
- See the latest release - -
-
+ +
+ See the latest release + +
+
- -
- Release archive - -
-
+ +
+ Release archive + +
+
-

Scroll horizontally to see all information

+

Scroll horizontally to see all information

- -
No search results
+ +
No search results
-
+
-
- - +
+
+ - -
-
+ + + -
+
- + + + + diff --git a/package.json b/package.json index 517fb18e..204a7091 100644 --- a/package.json +++ b/package.json @@ -9,18 +9,19 @@ }, "author": "Joe Brady", "devDependencies": { - "open": "^0.0.5", "chai": "^3.5.0", + "eslint": "^3.18.0", "gulp": "^3.9.1", "gulp-autoprefixer": "^3.1.1", "gulp-babel": "^6.1.2", + "gulp-compile-handlebars": "^0.6.1", "gulp-concat": "^2.6.1", + "gulp-imagemin": "^3.1.1", "gulp-minify-css": "^1.2.4", "gulp-rename": "^1.2.2", "gulp-sass": "^3.1.0", "gulp-uglify": "^2.1.2", - "gulp-imagemin": "^3.1.1", "mocha": "^3.2.0", - "eslint": "^3.18.0" + "open": "^0.0.5" } } diff --git a/releases.html b/releases.html index d9dcce9e..560fcf37 100644 --- a/releases.html +++ b/releases.html @@ -12,7 +12,6 @@ - @@ -29,6 +28,7 @@

Installation

Get involved

Support

+ @@ -40,129 +40,129 @@ -
+
+ + - +
+

Latest release:

+
-
-

Latest release:

-
+
+ +
- +
- - - + + + + + diff --git a/src/handlebars/about.handlebars b/src/handlebars/about.handlebars new file mode 100644 index 00000000..591a08be --- /dev/null +++ b/src/handlebars/about.handlebars @@ -0,0 +1,97 @@ +{{> header title='About - AdoptOpenJDK' }} + + +
+ +

About

+ +
+ + +
+

About AdoptOpenJDK - GetOpenJDK

+

+ This initiative came about following a discussion about the general lack of an open and reproducible build & test system for the OpenJDK source + across multiple platforms. Practically, it's a reboot of the work that has already been done for a while in the OpenJDK project producing binaries + for developers and end users. +

+ +

+ The intention is to provide binaries and hardware access for all of the major platforms, for the purposes of: +

    +
  • Research and Development by academics, researchers and enthusiasts.
  • +
  • An open, common, audited, build infrastructure for vendors to use (if they wish).
  • +
  • Providing binaries for bleeding edge early adopters.
  • +
  • Providing a place to try out build infrastructure ideas that might one day be moved to OpenJDK proper.
  • +
+

+ +

+ Although we will be making the binaries to the highest quality possible via jtreg, jcov test coverage and possibly other donated test + suites. It is not the intention that the binaries produced will be professionally supported. See + Support for details. +

+ +

+ There may be some areas of overlap with other past/present efforts, but that's OK. We expect any duplication to converge in due course and have + started working with other platform specific OpenJDK build efforts. +

+ +

+ Discussions will take place on the Mailing List, or via + the Github issues; and consensus recorded on this project website or the appropriate GitHub repo wiki as appropriate. +

+
+ +
+

Supported Forests

+

+ We'll start with jdk8u (effectively Java 8) with test coverage from the open jtreg tests, providing jcov test coverage reports. Later on other popular + forests such as jdk9, jdk10, valhalla, shenandoah etc will be added. +

+
+ +
+

Supported Platforms

+

+ We currently have Linux x64 and Mac OS X and are looking to rapidly add the other common Linux variants + Windows and Solaris. We envisage some + strong collaboration can form here with IcedTea and other specific platform efforts! +

+
+ +
+

About the AdoptOpenJDK Community

+

+ AdoptOpenJDK is a community of Java user group members, Java developers, Vendors who are + advocates of OpenJDK, the open source project which forms the basis of the Java™ programming language and + platform. +

+

+ Part of the group's activities occur at the Adoption Group on OpenJDK proper where you + can also join the Mailing List. +

+
+ +
+

License

+

+ Build scripts and other code to product the binaries, the website and other build infrastructure are licensed under + Apache License, Version 2.0. + OpenJDK code itself is licensed under GPL v2 with Classpath Exception. +

+
+ + + +
+ +
+ +{{> footer }} diff --git a/src/handlebars/getinvolved.handlebars b/src/handlebars/getinvolved.handlebars new file mode 100644 index 00000000..c6b2f85b --- /dev/null +++ b/src/handlebars/getinvolved.handlebars @@ -0,0 +1,15 @@ +{{> header title='Get Involved - AdoptOpenJDK' }} + +
+ +

Get involved

+ +

Join the mailing list

+

See the build wiki on GitHub

+

Having issues? Report them here

+ + + +
+ +{{> footer }} diff --git a/src/handlebars/index.handlebars b/src/handlebars/index.handlebars new file mode 100644 index 00000000..1cd126d2 --- /dev/null +++ b/src/handlebars/index.handlebars @@ -0,0 +1,57 @@ +{{> header title='AdoptOpenJDK' }} + +
+

+ Java™ is the world's leading programming language and platform. The code for Java is open source and available at + OpenJDK™. AdoptOpenJDK provides prebuilt OpenJDK binaries + from a fully open source set of build scripts and infrastructure. +

+

+ AdoptOpenJDK binaries are not professionally supported, see Support for details. +

+ + + + + +
+ +{{> footer script='' }} diff --git a/src/handlebars/installation.handlebars b/src/handlebars/installation.handlebars new file mode 100644 index 00000000..6bf16b43 --- /dev/null +++ b/src/handlebars/installation.handlebars @@ -0,0 +1,62 @@ +{{> header title='Installation - AdoptOpenJDK' }} + +
+ +

Installation

+ + + +
+
+

Linux and macOS installation

+
    +
  1. Download the latest tar.gz from the Latest release page to a directory that will not move or be deleted.
  2. +
  3. + Using Terminal, navigate to the location of this tar.gz: +
    cd <path/to/your/directory>
    +
  4. +
  5. + Extract the tar.gz. You can use the following command: +
    tar -xf <filename>.tar.gz
    +
  6. +
  7. + Add this version of Java™ to your PATH: +
    export PATH=$PWD/j2sdk-image/bin:$PATH
    +
  8. +
  9. + Check that it has installed correctly: +
    java -version
    +
  10. +
+
+ +
+

Windows installation

+
    +
  1. Download the latest .zip from the Latest release page to a directory that will not move or be deleted.
  2. +
  3. + Using the command prompt, navigate to the location of this .zip: +
    cd <path\to\your\directory>
    +
  4. +
  5. + Extract the .zip. You can use the following command: +
    unzip <filename>.zip
    +
  6. +
  7. + Add this version of Java™ to your PATH: +
    set PATH=%cd%\j2sdk-image\bin;%PATH%
    +
  8. +
  9. + Check that it has installed correctly: +
    java -version
    +
  10. +
+
+ +
+ +
+ +{{> footer }} diff --git a/src/handlebars/nightly.handlebars b/src/handlebars/nightly.handlebars new file mode 100644 index 00000000..4dac93d3 --- /dev/null +++ b/src/handlebars/nightly.handlebars @@ -0,0 +1,39 @@ +{{> header title='Nightly builds - AdoptOpenJDK' }} + +
+
+ +

Nightly builds

+ + +
+ See the latest release + +
+
+ + +
+ Release archive + +
+
+ +

Scroll horizontally to see all information

+ + +
No search results
+ +
+ +
+ + + + +
+
+ +
+ +{{> footer script='' script2='' }} diff --git a/src/handlebars/partials/footer.handlebars b/src/handlebars/partials/footer.handlebars new file mode 100644 index 00000000..d54c4f19 --- /dev/null +++ b/src/handlebars/partials/footer.handlebars @@ -0,0 +1,18 @@ + + + +{{{script}}} +{{{script2}}} + + diff --git a/src/handlebars/partials/header.handlebars b/src/handlebars/partials/header.handlebars new file mode 100644 index 00000000..0f0a1728 --- /dev/null +++ b/src/handlebars/partials/header.handlebars @@ -0,0 +1,41 @@ + + + + + + + {{title}} + + + + + + + + + + + + + + diff --git a/src/handlebars/releases.handlebars b/src/handlebars/releases.handlebars new file mode 100644 index 00000000..091b560a --- /dev/null +++ b/src/handlebars/releases.handlebars @@ -0,0 +1,111 @@ +{{> header title='Releases - AdoptOpenJDK' }} + +
+ + + +
+

Latest release:

+
+ + + +
+ + + + + + + + + +
+ +
+ +{{> footer script='' script2='' }} diff --git a/src/handlebars/support.handlebars b/src/handlebars/support.handlebars new file mode 100644 index 00000000..a6aba0f2 --- /dev/null +++ b/src/handlebars/support.handlebars @@ -0,0 +1,37 @@ +{{> header title='Support - AdoptOpenJDK' }} + + +
+ +

Support

+ +
+
+

WARNING

+

+ The AdoptOpenJDK OpenJDK binaries are not fully tested (i.e. JCK/TCK + further testing) and verified. If you want a formally tested + and verified Java binary then you can get one from a commercial vendor. +

+
+ +
+

Community Support

+

+ The OpenJDK community does not offer any official support for the binaries produced. If you do have questions, comments, want to report a bug or + wish to contribute then choose from one of the options below: +

+
+ + +
+ +
+ +{{> footer }} diff --git a/src/scss/styles-8-about.scss b/src/scss/styles-8-about.scss new file mode 100644 index 00000000..c2d34dbe --- /dev/null +++ b/src/scss/styles-8-about.scss @@ -0,0 +1,22 @@ +$mainblue: #152935; +$maingrey: #F5F5F5; +$brighterblue: #3D70B2; +$accentgrey: #dadada; + +main.about p, main.about ul { + max-width: 40rem; + margin: 1rem auto; + width: 80%; + text-align: left; + line-height: 1.8rem; +} + +main.about a { + text-decoration: none; + color: $brighterblue; +} + +main.about a:hover { + text-decoration: underline; + color: $brighterblue; +} diff --git a/support.html b/support.html index 59b0ab81..8afd445a 100644 --- a/support.html +++ b/support.html @@ -4,7 +4,7 @@ - AdoptOpenJDK - Support + Support - AdoptOpenJDK @@ -28,6 +28,7 @@

Installation

Get involved

Support

+ @@ -39,53 +40,55 @@ - -
+ +
-

Support

+

Support

-
-
-

WARNING

-

- The AdoptOpenJDK OpenJDK binaries are not fully tested (i.e. JCK/TCK + further testing) and verified. If you want a formally tested - and verified Java binary then you can get one from a commercial vendor. -

-
- -
-

Community Support

-

- The OpenJDK community does not offer any official support for the binaries produced. If you do have questions, comments, want to report a bug or - wish to contribute then choose from one of the options below: -

-
- - +
+
+

WARNING

+

+ The AdoptOpenJDK OpenJDK binaries are not fully tested (i.e. JCK/TCK + further testing) and verified. If you want a formally tested + and verified Java binary then you can get one from a commercial vendor. +

-
+
+

Community Support

+

+ The OpenJDK community does not offer any official support for the binaries produced. If you do have questions, comments, want to report a bug or + wish to contribute then choose from one of the options below: +

+
-
+ +
+
+ + +

GitHub build repo

-

Java and OpenJDK are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

-
+ + +

Having issues? 

+
+

Java and OpenJDK are trademarks or registered trademarks of Oracle and/or its affiliates. Other names may be trademarks of their respective owners.

+ + + + -