From 8996468b1c65d84294e43db0922f53cc9b8896c2 Mon Sep 17 00:00:00 2001 From: erciccione Date: Wed, 22 Apr 2020 10:08:59 +0200 Subject: [PATCH 1/2] Remove 'Using' page --- _data/lang/ar/navigation.yml | 2 - _data/lang/de/navigation.yml | 2 - _data/lang/en/navigation.yml | 2 - _data/lang/es/navigation.yml | 2 - _data/lang/fr/navigation.yml | 2 - _data/lang/it/navigation.yml | 2 - _data/lang/nl/navigation.yml | 2 - _data/lang/pl/navigation.yml | 2 - _data/lang/pt-br/navigation.yml | 2 - _data/lang/ru/navigation.yml | 2 - _data/lang/tr/navigation.yml | 2 - _data/lang/zh-cn/navigation.yml | 2 - _data/lang/zh-tw/navigation.yml | 2 - _i18n/en.yml | 34 ---------- get-started/using/index.md | 109 -------------------------------- 15 files changed, 169 deletions(-) delete mode 100644 get-started/using/index.md diff --git a/_data/lang/ar/navigation.yml b/_data/lang/ar/navigation.yml index 3ef9ced7..0c21e724 100644 --- a/_data/lang/ar/navigation.yml +++ b/_data/lang/ar/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: ما هو مونيرو ؟ url: get-started/what-is-monero - - page: الإستخدام - url: get-started/using - page: القبول url: get-started/accepting - page: المشاركه diff --git a/_data/lang/de/navigation.yml b/_data/lang/de/navigation.yml index f22cdf3f..3ce370fa 100644 --- a/_data/lang/de/navigation.yml +++ b/_data/lang/de/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: Was ist Monero? url: get-started/what-is-monero - - page: Nutzen - url: get-started/using - page: Akzeptieren url: get-started/accepting - page: Unterstützen diff --git a/_data/lang/en/navigation.yml b/_data/lang/en/navigation.yml index 8069811e..93a8e39f 100644 --- a/_data/lang/en/navigation.yml +++ b/_data/lang/en/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: What is Monero? url: get-started/what-is-monero - - page: Using - url: get-started/using - page: Accepting url: get-started/accepting - page: Contributing diff --git a/_data/lang/es/navigation.yml b/_data/lang/es/navigation.yml index b2e7315a..adb210f6 100644 --- a/_data/lang/es/navigation.yml +++ b/_data/lang/es/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: ¿Qué es Monero? url: get-started/what-is-monero - - page: Usar Monero - url: get-started/using - page: Aceptar Monero url: get-started/accepting - page: Contribuir a Monero diff --git a/_data/lang/fr/navigation.yml b/_data/lang/fr/navigation.yml index 801326f1..61b29002 100644 --- a/_data/lang/fr/navigation.yml +++ b/_data/lang/fr/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: Qu'est-ce que Monero ? url: get-started/what-is-monero - - page: Utiliser - url: get-started/using - page: Accepter url: get-started/accepting - page: Contribuer diff --git a/_data/lang/it/navigation.yml b/_data/lang/it/navigation.yml index 632b2318..26a7d654 100644 --- a/_data/lang/it/navigation.yml +++ b/_data/lang/it/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: Cos'è Monero? url: get-started/what-is-monero - - page: Utilizzo - url: get-started/using - page: Adozione url: get-started/accepting - page: Contribuire diff --git a/_data/lang/nl/navigation.yml b/_data/lang/nl/navigation.yml index 89c27926..38727bb7 100644 --- a/_data/lang/nl/navigation.yml +++ b/_data/lang/nl/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: Wat is Monero? url: get-started/what-is-monero - - page: Gebruiken - url: get-started/using - page: Accepteren url: get-started/accepting - page: Bijdragen diff --git a/_data/lang/pl/navigation.yml b/_data/lang/pl/navigation.yml index 37a93057..89c56659 100644 --- a/_data/lang/pl/navigation.yml +++ b/_data/lang/pl/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: Czym jest Monero? url: get-started/what-is-monero - - page: Używanie - url: get-started/using - page: Akceptowanie url: get-started/accepting - page: Współpraca diff --git a/_data/lang/pt-br/navigation.yml b/_data/lang/pt-br/navigation.yml index dac94ef7..96288e82 100644 --- a/_data/lang/pt-br/navigation.yml +++ b/_data/lang/pt-br/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: O que é o Monero? url: get-started/what-is-monero - - page: Usando - url: get-started/using - page: Aceitando url: get-started/accepting - page: Contribuindo diff --git a/_data/lang/ru/navigation.yml b/_data/lang/ru/navigation.yml index 580ba17a..05f1a83a 100644 --- a/_data/lang/ru/navigation.yml +++ b/_data/lang/ru/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: Что такое Monero? url: get-started/what-is-monero - - page: Использование - url: get-started/using - page: Получение url: get-started/accepting - page: Содействие diff --git a/_data/lang/tr/navigation.yml b/_data/lang/tr/navigation.yml index d6804294..47319c20 100644 --- a/_data/lang/tr/navigation.yml +++ b/_data/lang/tr/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: Monero Nedir? url: get-started/what-is-monero - - page: Kullanımı - url: get-started/using - page: Kabulü url: get-started/accepting - page: Katkıda Bulunulması diff --git a/_data/lang/zh-cn/navigation.yml b/_data/lang/zh-cn/navigation.yml index b568c49d..ad0f6c02 100644 --- a/_data/lang/zh-cn/navigation.yml +++ b/_data/lang/zh-cn/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: 什么是门罗币？ url: get-started/what-is-monero - - page: 使用 - url: get-started/using - page: 接收 url: get-started/accepting - page: 贡献 diff --git a/_data/lang/zh-tw/navigation.yml b/_data/lang/zh-tw/navigation.yml index dd52a537..6884669b 100644 --- a/_data/lang/zh-tw/navigation.yml +++ b/_data/lang/zh-tw/navigation.yml @@ -2,8 +2,6 @@ subfolderitems: - page: 什麼是門羅幣？ url: get-started/what-is-monero - - page: 開始使用 - url: get-started/using - page: 接受支付 url: get-started/accepting - page: 貢獻 diff --git a/_i18n/en.yml b/_i18n/en.yml index e507628a..fae9929f 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -396,40 +396,6 @@ mining: software: Mining Software software_para: Note that some miners may have developer fees. -using: - intro: Transacting with Monero can be made easy. This page is designed to guide users in that process. - learn: 1. Learn - learn_para1: Monero is a secure, private, and untraceable cryptocurrency. The developers and community are committed to protecting these values. Learn more by reading the - learn_para2: What is Monero - learn_para3: page. The - learn_para4: source code - learn_para5: is also available for review and discussion. - support: 2. Request Support - support_para1: There is a large and supportive community that will assist if you experience any difficulty. See the - support_para2: Hangouts - support_para3: page for more information. - generate: 3. Generate a Wallet - generate_para1: A Monero wallet is required to secure your own funds. See the - generate_para2: Downloads page - generate_para3: for a listing of available wallets. - generate_para4: The easiest way to run a Monero node, without affecting your home bandwidth, is to purchase a VPS (Virtual Private Server). We strongly recommend - generate_para5: using the - generate_para6: coupon code to get a discount over and above their already cheap $6/month VPS. Using this coupon code and/or - generate_para7: our affiliate link - generate_para8: will also assist in the ongoing funding of Monero development. - acquire: 4. Acquire Monero - acquire_para1: Monero may be purchased on an - acquire_para2: exchange - acquire_para3: with fiat or other cryptocurrencies. An alternate way of acquiring Monero is via - acquire_para4: mining, - acquire_para5: the computationally-complex process whereby transactions are immutably recorded on the blockchain. - send-receive: 5. Send and Receive Monero - send-receive_para1: Learn how to send and receive Monero by viewing the - send-receive_para2: guide. - transact: 6. Transact with Monero - transact_para1: Monero may be used to purchase many goods and services. For a listing, see the - transact_para2: Merchants page. - what-is-monero: need-to-know: What you need to know leading: Monero is the leading cryptocurrency with a focus on private and censorship-resistant transactions. diff --git a/get-started/using/index.md b/get-started/using/index.md deleted file mode 100644 index 52d777e4..00000000 --- a/get-started/using/index.md +++ /dev/null @@ -1,109 +0,0 @@ ---- -layout: custom -title: titles.using -permalink: /get-started/using/index.html ---- -{% t global.lang_tag %} -
-

{% t using.intro %}

-
-
-
-
- -
-
-
-
-

{% t using.learn %}

-

{% t using.learn_para1 %} {% t using.learn_para2 %} {% t using.learn_para3 %} {% t using.learn_para4 %} {% t using.learn_para5 %}

-
-
- Learn online, read or talk to people -
-
-
-
- -
-
-
-
-
-
-
-
- Learn online, read or talk to people -
-
-

{% t using.support %}

-

{% t using.support_para1 %} {% t using.support_para2 %} {% t using.support_para3 %}

-
-
-
-
-
-
-
-
-

{% t using.generate %}

-

{% t using.generate_para1 %} {% t using.generate_para2 %} {% t using.generate_para3 %}

{% t using.generate_para4 %} InterServer.net {% t using.generate_para5 %} 'MONERO' {% t using.generate_para6 %} {% t using.generate_para7 %} {% t using.generate_para8 %}

-
-
- Learn online, read or talk to people -
-
-
-
-
-
-
-
- -
-
-
-
- Learn online, read or talk to people -
-
-

{% t using.acquire %}

-

{% t using.acquire_para1 %} {% t using.acquire_para2 %} {% t using.acquire_para3 %} {% t using.acquire_para4 %} {% t using.acquire_para5 %}

-
-
-
-
- -
-
-
-
-
-
-
-
-

{% t using.send-receive %}

-

{% t using.send-receive_para1 %} {% t using.send-receive_para2 %}

-
-
- Learn online, read or talk to people -
-
-
-
-
-
-
-
- Learn online, read or talk to people -
-
-

{% t using.transact %}

-

{% t using.transact_para1 %} {% t using.transact_para2 %}

-
-
-
-
-
-
-
From 5ee1ff750357be19bdb21d6b4c82b3e623c32514 Mon Sep 17 00:00:00 2001 From: erciccione Date: Tue, 21 Apr 2020 10:34:46 +0200 Subject: [PATCH 2/2] Revamped homepage - Changed the 'Get Started' button to 'Learn more about Monero' which now links to the 'What is Monero?' page - Replaced the 'Why Monero is different' section with 'Get started', which now contains the info and links necessary to start using Monero. The picture were taken from the 'Using' page, now removed. - Removed 'Downloads' and added 'Guide and Resources' - Removed 'Last news' box - Added a 'Join the Community' section --- _i18n/en.yml | 49 ++++---- css/custom.css | 11 +- img/mrl-logo.svg | 1 + index.html | 287 +++++++++++++++++++++-------------------------- 4 files changed, 160 insertions(+), 188 deletions(-) create mode 100644 img/mrl-logo.svg diff --git a/_i18n/en.yml b/_i18n/en.yml index fae9929f..d2035b1a 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -54,36 +54,33 @@ index: home: heading2: A Private Digital Currency monero_is_cash: Monero is cash for a connected world. It’s fast, private, and secure. With Monero, you are your own bank. You can spend safely, knowing that others cannot see your balances or track your activity. + whatis: Learn more about Monero get_started: Get Started - why_monero_is_different: Why Monero is different - monero_is_secure: Monero is secure - monero_is_secure_para: Monero is a decentralized cryptocurrency, meaning it is secure digital cash operated by a network of users. Transactions are confirmed by distributed consensus and then immutably recorded on the blockchain. Third-parties do not need to be trusted to keep your Monero safe. - monero_is_private: Monero is private - monero_is_private_para: Monero uses ring signatures, ring confidential transactions, and stealth addresses to obfuscate the origins, amounts, and destinations of all transactions. Monero provides all the benefits of a decentralized cryptocurrency, without any of the typical privacy concessions. - monero_is_untraceable: Monero is untraceable - monero_is_untraceable_para: Sending and receiving addresses as well as transacted amounts are obfuscated by default. Transactions on the Monero blockchain cannot be linked to a particular user or real-world identity. - monero_is_fungible: Monero is fungible - monero_is_fungible_para1: Monero is - monero_is_fungible_para2: fungible - monero_is_fungible_para3: because it is private by default. Units of Monero cannot be blacklisted by vendors or exchanges due to their association in previous transactions. + choosewallet: Choose a Wallet + choosewallet_para: To use Monero, the first thing you are going to need is a wallet. Visit our Downloads page and get the right wallet for you. The Monero wallets are available for a variety of platforms and contain everything you need to use Monero immediately. downloads: Downloads - downloads_windows: Monero for Windows - downloads_mac: Monero for Mac - downloads_linux: Monero for Linux - downloads_blockchain: Latest Blockchain - different_system: Need it for a different operating system? - view_all_downloads: View all available downloads here. - latest_news: Latest News - more_news: More news - moneropedia: Moneropedia + getcoins: Get Some Coins + getcoins_para: After you install a wallet, you need to get some Monero. There are multiple ways to acquire some coins to spend, like mining or working in exchange for Monero, but the easiest way is to use an exchange and convert your fiat money into XMR. many exchanges, centralized and decentralized, list Monero (XMR). + exchanges: Exchanges + useit: "It's a Currency: Use It!" + useit_para: Monero is a currency and can be exchanged for goods and services, privately and with very low fees. Many entities will gladly accept XMR for payments; take a look at our list of merchants currently accepting Monero. + merchants: Merchants + answers: Find Answers to Your Questions + faq: FAQ + faq_para: We've heard a lot of questions over the years and have compiled a thorough and varied FAQ. Don't worry, if your questions are not in there, you can always ask the community. + guides: Guides and Resources + guides_para: > + The community has put together a vast amount of resources and documentation. Users can find useful info and guides about common configurations and + tips in the 'User Guides' section. Developers can find everything they need to build a service based on Monero or simply communicate with the network + in the 'Developer Guides'. The Library offers publications and books downloadable for free, including the full 'Mastering Monero' and 'Zero to Monero' books. moneropedia_para: Would you like to look up the meanings of the terms and concepts used in Monero? Here you will find an alphabetical guide to terms and their meanings from both the Monero and Kovri projects. moneropedia_button: Read Moneropedia - user_guides: User Guides - user_guides_para: Step-by-step guides to all things Monero are separated by category and cover everything from creating a wallet to supporting the network, and even how to edit this website. - user_guides_button: Read user guides - faq: FAQ - faq_para: We've heard a lot of questions over the years and have compiled, for your convenience, a thorough and varied FAQ. Don't worry, if your questions are not on here, you can always ask the community. - faq_button: Read answers + joincommunity: Join the Community + contributecommunity: "We Need Your Skills: Contribute!" + contributecommunity_para: Monero is not simply a currency, it's a decentralized community and exists only thanks to the hundred of volunteers that dedicate their time to the project. Join us! + researchlab_para: The MRL (Monero Research Lab) is a very important part of Monero. Researchers and cryptographers from all over the world meet to find new ways to improve Monero. Read their papers and join them! + visitmrl: Visit the MRL + contributing: Contributing hangouts: intro: The Monero community is diverse and varied. We come from all over, but we definitely have some places we like to hang out together. You'll find most of them below. Join us! diff --git a/css/custom.css b/css/custom.css index 2fcb0f59..98dde27f 100644 --- a/css/custom.css +++ b/css/custom.css @@ -1373,6 +1373,7 @@ h2#main-h2 { .about-main p { padding-top: 0.5rem; + padding-bottom: 0.5rem; } .info-block h2 { @@ -1781,7 +1782,7 @@ a.btn-link:hover span.icon-blockchain, a.btn-link:focus span.icon-blockchain, a. } .btn-fixed { - width: 17rem; + width: 10rem; display: block; } @@ -2586,6 +2587,11 @@ img.monero-logo { margin: 0 auto; } +.info-block-row img.main-icon-mrl { + width: 40%; + margin: 0 auto; +} + .about-monero .info-block-row img.main-icon { width: 60%; margin: 0 auto; @@ -2612,6 +2618,9 @@ p.main-downloads { padding-top: 0; } +.btn-intro{ + width: 92%; +} @media only screen and (max-width: 75rem) { diff --git a/img/mrl-logo.svg b/img/mrl-logo.svg new file mode 100644 index 00000000..25cb0423 --- /dev/null +++ b/img/mrl-logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/index.html b/index.html index 8482e5d3..d7330a39 100644 --- a/index.html +++ b/index.html @@ -4,180 +4,145 @@ title: Home permalink: index.html ---
-
-
-
-
-
- - -
- +
+
+
+
+
+ +
-
-
-

{% t global.monero %}

-

{% t home.heading2 %}

+
+
+
+

{% t global.monero %}

+

{% t home.heading2 %}

{% t home.monero_is_cash %}

-

{% t home.get_started %}

-
+

{% t home.whatis %}

-
+
+
- + +
+
+
+

{% t home.get_started %}

+
+
+
+

{% t home.choosewallet %}

+

{% t home.choosewallet_para %}

+

{% t home.downloads %}

+
+
+ Create wallet +
+
+
+
+ Exchange +
+
+

{% t home.getcoins %}

+

{% t home.getcoins_para %}

+

{% t home.exchanges %}

+
+ +
+
+
+

{% t home.useit %}

+

{% t home.useit_para %}

+

{% t home.merchants %}

+
+
+ Merchants +
+
+
+
+ FAQ +
+
+

{% t home.answers %}

+

{% t home.faq_para %}

+

{% t home.faq %}

+
+
+
+
+ -
+
+
+ +
-

{% t home.why_monero_is_different %}

+

{% t home.guides %}

-
-
-

{% t home.monero_is_secure %}

-

{% t home.monero_is_secure_para %}

+
+
+
+

{% t home.guides_para %}

+
+
+
+

{% t titles.userguides %}

+
+
+

{% t titles.developerguides %}

+
+
+

{% t titles.library %}

+
-
- Secure safe -
-
-
-
- No surveillance -
-
-

{% t home.monero_is_private %}

-

{% t home.monero_is_private_para %}

-
- -
-
-
-

{% t home.monero_is_untraceable %}

-

{% t home.monero_is_untraceable_para %}

-
-
- Untraceable Monero paths -
-
-
-
- Monero gold -
-
-

{% t home.monero_is_fungible %}

-

{% t home.monero_is_fungible_para1 %} {% t home.monero_is_fungible_para2 %} {% t home.monero_is_fungible_para3 %}

-
-
-
- - - - - - - -
-
- -
-
-
-

{% t home.downloads %}

-
-
-
-

{% t downloads.gui %}

-
-
-

{% t downloads.cli %}

-
-
-
-
-

{% t downloads.bootstrapnode %}

-
-
-

{% t downloads.hardware %}

-
-
-
-

{% t home.different_system %} {% t home.view_all_downloads %}

-
-
-
-
- - - -
-
-
-

{% t home.latest_news %}

-
-
- {% for post in site.posts limit:2 %} -
-
-

{{ post.title }}

-
-
- {% endfor %} - - -
-
-

{% t home.more_news %}

-
-
-
-
-
-
-
- - - - - -
+ + + +
+
+

Moneropedia

+

{% t home.moneropedia_para %}

+

{% t home.moneropedia_button %}

+
+
+ +
+ + +
+
- -
-
-

{% t home.moneropedia %}

-

{% t home.moneropedia_para %}

-

{% t home.moneropedia_button %}

-
-
- - - -
-
-

{% t home.user_guides %}

-

{% t home.user_guides_para %}

-

{% t home.user_guides_button %}

-
-
- - - -
-
-

{% t home.faq %}

-

{% t home.faq_para %}

-

{% t home.faq_button %}

-
-
- +

{% t home.joincommunity %}

-
- - +
+
+

{% t home.contributecommunity %}

+

{% t home.contributecommunity_para %}

+

{% t home.contributing %}

+
+
+ Contribute +
+
+
+
+ Monero Research Lab +
+
+

{% t titles.researchlab %}

+

{% t home.researchlab_para %}

+

{% t home.visitmrl %}

+
+
+ +