diff --git a/_config.yml b/_config.yml index ffdc9fda22c27ad8a7e7d19abbfea3278e835a13..6b8eb921856d68352b5d7d6f1771d7633685a44d 100644 --- a/_config.yml +++ b/_config.yml @@ -1,4 +1,4 @@ -email: dev@monero.cc +email: dev@getmonero.org name: Monero description: Private. Secure. Untraceable. keywords: "monero, xmr, bitmonero, cryptocurrency" diff --git a/_data/downloads.yml b/_data/downloads.yml new file mode 100644 index 0000000000000000000000000000000000000000..8e62b03a51b4a52b2302bd24e22936b66c970db0 --- /dev/null +++ b/_data/downloads.yml @@ -0,0 +1,20 @@ +- platform: Windows, 64-bit + icon: windows.svg + url: /downloads/win64 + hash: facbeb2e408cf8b9a46534363eba161dbb047654 + version: 0.8.8.6 +- platform: Mac OS X, 64-bit + icon: apple.svg + url: /downloads/mac64 + hash: 7069de92083fb7831b063cc152e8f35508ff61bf + version: 0.8.8.6 +- platform: Linux, 64-bit + icon: linux.svg + url: /downloads/linux64 + hash: 16f3f55bcfbfae6135cbeda6574f651890a8be64 + version: 0.8.8.6 +- platform: Mac OS X, 64-bit + icon: freebsd.svg + url: /downloads/freebsd64 + hash: 9fd0005b697e146a26a0bf9e3cd0c89b978f7fbd + version: 0.8.8.6 diff --git a/_includes/footer.html b/_includes/footer.html index b0948abc63747e5b627ac32c5658d01fdf4e10f5..52d25d0d34ab1027aca8e402898e5eb1bd0a97ef 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,8 +1,7 @@ <div class="footer"> <div class="container"> <p> - {% t global.copyright %} © <strong>{% t global.monero_project %}</strong> - <a href="http://github.com/monero-project/bitmonero"><i class="fa fa-2x fa-github-square"></i></a> + <strong style="color: #ffffff;">[ <a href="/legal/terms">{% t global.terms %}</a> | <a href="/legal/privacy">{% t global.privacy %}</a> | <a href="/legal/copyright">{% t global.copyright %}</a> ]</strong> <a href="http://reddit.com/r/Monero/"><i class="fa fa-2x fa-reddit-square"></i></a> <a href="http://twitter.com/monerocurrency"><i class="fa fa-2x fa-twitter-square"></i></a> <a href="https://plus.google.com/101861896996947433029/posts"><i class="fa fa-2x fa-google-plus-square"></i></a> diff --git a/_includes/header.html b/_includes/header.html index 5f857010b0d14e50d41796f3b502906de9043cd0..bfe9987cee66a3437e2be12a8929c4cfb43182f6 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -26,6 +26,7 @@ <ul class="dropdown-menu" role="menu"> <li><a href="/getting-started/choose">{% t menu.choose %}</a></li> <li><a href="/getting-started/running">{% t menu.running %}</a></li> + <li><a href="/getting-started/donate">{% t menu.donations %}</a></li> <li class="divider"></li> <li><a href="/downloads">{% t menu.downloads %}</a></li> <li class="divider"></li> diff --git a/_strings_en.yml b/_strings_en.yml index fe226e7094d5501036e32d8421de7a5a4a808e7a..bc6560d5c5755c73b3d23f9325444e526281b1d0 100644 --- a/_strings_en.yml +++ b/_strings_en.yml @@ -4,6 +4,9 @@ global: getting_started: Getting Started copyright: Copyright monero_project: The Monero Project + terms: Terms + privacy: Privacy + copyright: Copyright menu: forum: Forum blog: Blog @@ -17,6 +20,7 @@ menu: uncategorised: Uncategorized choose: How to Choose a Monero Client running: How to Run a Monero Node + donations: Donating and Sponsorships downloads: All Monero Downloads merchants: Monero Merchant Directory accepting: Accepting Monero Payments diff --git a/getting-started/donate.md b/getting-started/donate.md new file mode 100644 index 0000000000000000000000000000000000000000..94073bea466dac468661244210c9c4c20f01a65c --- /dev/null +++ b/getting-started/donate.md @@ -0,0 +1,12 @@ +--- +layout: static_page +title: "Donating and Sponsorships" +title-pre-kick: "Donating and " +title-kick: "Sponsorships" +title-post-kick: "" +kick-class: "kicks" +icon: "icon_donations" +attribution: "<!-- Icon is based on work by Freepik (http://www.freepik.com) and is licensed under Creative Commons BY 3.0 -->" +--- + +### Work in Progress \ No newline at end of file diff --git a/legal/copyright.md b/legal/copyright.md new file mode 100644 index 0000000000000000000000000000000000000000..9bb25c16f616a30d8801cdfae8a14b4cc1d635da --- /dev/null +++ b/legal/copyright.md @@ -0,0 +1,20 @@ +--- +layout: static_page +title: "Copyright" +title-pre-kick: "Copyrights on this " +title-kick: "Website " +title-post-kick: "" +kick-class: "softyellow-kicks" +icon: "icon_copyright" +attribution: "" +--- + +### The Monero Project + +The bulk of the content on this website is copyright The Monero Project. It is made available under the CC BY 3.0 license (the [Creative Commons Attribution 3.0 Unported license](http://creativecommons.org/licenses/by/3.0/)). This means that you can copy and redistribute the material in any medium or format, and remix, transform, and build upon the material for any purpose, even commercially. However, when doing so you must give appropriate credit, provide a link to the license, and indicate if changes were made. You may do so in any reasonable manner, but not in any way that suggests The Monero Project endorses you or your use. + +### Icons and Other Attributed Items + +Where an icon is used we have attempted to find an icon in public domain or covered by a Creative Commons license. Attribution for the icon is given in HTML comments in the page source where appropriate and possible. + +Certain logos, such as those for the operating systems and platforms we support as well as those of our sponsors, are copyrighted by their owners. The Monero Project does not own these copyrights, and use these logos either with permission or in an unambiguous and unharmful way. diff --git a/legal/privacy.md b/legal/privacy.md new file mode 100644 index 0000000000000000000000000000000000000000..fd3fb9f9ff52b8570d2328bc10c78af1df39d24b --- /dev/null +++ b/legal/privacy.md @@ -0,0 +1,22 @@ +--- +layout: static_page +title: "Privacy" +title-pre-kick: "Privacy " +title-kick: "Policy" +title-post-kick: "" +kick-class: "green-kicks" +icon: "icon_privacy" +attribution: "" +--- + +### What We Collect + +The Monero Project uses Google Analytics to collect usage and visitor data for this website. This is enabled via a small piece of JavaScript code, and will not run if you have JavaScript disabled. + +We also collect standard server logs from our webserver. We do not use or collect cookies. + +### What We Use the Data For + +The Google Analytics data is used to provide statistics on the website and help us to improve the content and the information flow. + +Server logs are used to analyse errors and diagnose requests to dead links. A portion of the server logs are used to gather statistics on Monero downloads in order to help us better understand our user's needs. \ No newline at end of file diff --git a/legal/terms.md b/legal/terms.md new file mode 100644 index 0000000000000000000000000000000000000000..abdd83b3d7304e841b92816dc9a87e50642a741c --- /dev/null +++ b/legal/terms.md @@ -0,0 +1,12 @@ +--- +layout: static_page +title: "Monero Research Lab" +title-pre-kick: "The Monero " +title-kick: "Research " +title-post-kick: "Lab" +kick-class: "lab-kicks" +icon: "icon_labs" +attribution: "" +--- + +### Work in Progress \ No newline at end of file