Commit c23db9b2 authored by Mike Justman's avatar Mike Justman Committed by GitHub
Browse files

Merge branch 'master' into text-revisions-0

parents 5d434aa4 d124609a
ietemplates/
_site/*
.idea/
*.swp
tags
source 'https://rubygems.org'
gem 'jekyll'
gem 'jekyll-paginate'
gem 'builder'
gem 'rubysl-rexml'
gem 'wdm', '>= 0.1.0' if Gem.win_platform?
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.1)
public_suffix (~> 2.0, >= 2.0.2)
builder (3.2.3)
colorator (1.1.0)
ffi (1.9.18)
forwardable-extended (2.6.0)
jekyll (3.5.2)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-paginate (1.1.0)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
kramdown (1.14.0)
liquid (4.0.0)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
mercenary (0.3.6)
pathutil (0.14.0)
forwardable-extended (~> 2.6)
public_suffix (2.0.5)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (1.11.1)
rubysl-rexml (2.0.4)
safe_yaml (1.0.4)
sass (3.5.1)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
PLATFORMS
ruby
DEPENDENCIES
builder
jekyll
jekyll-paginate
rubysl-rexml
BUNDLED WITH
1.15.4
......@@ -40,25 +40,20 @@ If for any reason you have questions or need to contact us, you can find us on t
## 2.0 What you'll need
* Jekyll: Getmonero.org is made using a simple, static website generator called [Jekyll](https://jekyllrb.com/). You will need it installed on your system to test any changes that you made. If you're using a Linux-based system you can just follow the instructions on the website to get up and going. If you're using Windows, you will want to check out [this site](http://jekyll-windows.juthilo.com/) for instructions on how to get Jekyll working on your system.
* Jekyll: Getmonero.org is made using a simple, static website generator called [Jekyll](https://jekyllrb.com/). You will need it installed on your system to test any changes that you made. If you're using Windows, you will want to check out [this site](http://jekyll-windows.juthilo.com/) for instructions on how to get Jekyll working on your system. If you're using a Linux-based system you can just follow the instructions on the website to get up and going:
* Install Ruby
* Install Bundler: `gem install bundler`
* Install Jekyll with all dependencies (run from the project directory): `bundle`
* GitHub: Pretty much everything in Monero is hosted on [GitHub](https://github.com) and uses Git as the primary version control system. If you're not familiar with how to use Git, you can check out [this tutorial](https://guides.github.com/activities/hello-world/) for a good overview. It will take you through pretty much everything you'll need to know to edit the website. If you haven't already, register for GitHub and fork the [Monero Website repository](https://github.com/monero-project/monero-site).
* Markdown experience: To write pages, you're going to need to know how to use Markdown. It's basically a in-between language that enables people who don't know HTML to just write, and it will be compiled into HTML for you. You can find a great Markdown cheat sheet with examples [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). IF you need more help, Google and YouTube are great resources.
* Markdown experience: To write pages, you're going to need to know how to use Markdown. It's basically an in-between language that enables people who don't know HTML to just write, and it will be compiled into HTML for you. You can find a great Markdown cheat sheet with examples [here](https://github.com/adam-p/markdown-here/wiki/Markdown-Cheatsheet). IF you need more help, Google and YouTube are great resources.
*Note: If you're confused, feel free to click other files in the same directory (folder) that you are in for the step that you are on to see some working examples. Compare them to the instructions and you should understand better.*
* Jekyll Gems: The current iteration of the getmonero.org website uses the following plugins:
* [jekyll-paginate](https://jekyllrb.com/docs/pagination/)
* builder
* rubysl-rexml
* In the event that more gems are added, this documentation will be updated to reflect the changes needed to build the site.
*Note:* To install them all at once, use the command: `gem install builder rubysl-rexml jekyll-paginate`
Once you have the above list of things, it's typically a good idea to build the website from your local computer to make sure it works before you make any changes. To do this, complete the following steps:
1. Navigate to the your local `monero-site` repository.
1. Navigate to your local `monero-site` repository.
2. Serve the website: `jekyll serve`
3. Open a browser and go to [http://127.0.0.1:4000](http://127.0.0.1:4000).
4. If all went well, you should see the Monero website and you're ready to make changes.
......@@ -69,12 +64,21 @@ The average Monero user that will want to contribute to the website should proba
If you are a web developer and would like to make large macro-level changes, it would be best to get in contact with rehrar. The HTML/CSS framework is custom, though quite easy to use for a seasoned developer. Still, there are some pages that are more complicated than others and would require fair amounts of styling changes should the structure change significantly.
This website is completely open-source however, and anything and everything is available for changing should the community deem it necessary.
This website is completely open-source however and anything and everything is available for changing should the community deem it necessary.
Every section from here on out will talk about how to make a specific type of web page. It will start with a bullet point list of what to do for the advanced among you that just want a quick overview. For those who are still learning this list is followed by a detailed explanation, starting with example front matter. Any variable in the front matter written in all caps you are expected to change (make sure your changes are not all caps though). It will then lead you through the rest of the process until it's time to type your content.
All external links must have http:// or https:// in front of them or they will not redirect properly.
### 3.1 Housekeeping
#### GitHub Issues
We ask that if you open an issue on the site that you remain available for clarifying questions or corrections. We do our best to close issues that are resolved when we make changes to the site, but If your issue is resolved by a contributer and the issue is not closed we ask that you close it in a timely manner. A contributer (rerhar, SamsungGalaxyPlayer, or other community members, etc) may ask you to close an issue after it's confirmed fixed. Please review the changes to the site and close your issue if you can verify that it's fixed.
#### Pull Requests
Contributers should use [issue keywords](https://help.github.com/articles/closing-issues-using-keywords/) to make it easier for maintainers to close issues when they merge. Include close, closes, closed, fix, fixes, fixed, resolve, resolves, resolved, etc in the commit message or pull request description, so that the correct issue can be closed if your PR is merged. (Example: 'fixes #1234' could close Issue 1234 when merged.)
Pull requests allow others to make comments or review your changes to the site. We ask that you remain available to comment or make changes to your PR. Pull requests with pending changes for more than 30 days will be closed and need to be resubmitted in the future. Sometimes someone else's changes might make your changes conflict with the current site. If that happens you may need to rebase your PR. (If you're unsure about how to do so, you can reach out to other contributers on IRC (freenode #monero) and someone should be able to walk you through it.
## 4.0 How to make a blog post
### 4.1 Quick Start
......@@ -111,7 +115,7 @@ You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure
### 5.1 Quick Start
* Make file in /resources/user-guides with a .md ending and no spaces in filename.
* Make file in /resources/user-guides with an .md ending and no spaces in filename.
* Front Matter as in 5.3
* Write User Guide
* Add guide using markdown in the correct category in /resources/user-guides/index.md being careful not to mess with any indentation
......@@ -139,7 +143,7 @@ DO NOT CHANGE ANYTHING IN THIS DOCUMENT BESIDES WHAT YOU ARE INSTRUCTED TO.
This file will look quite different because it's HTML. Don't panic. Simply Ctrl + F (i.e. the find feature) and search for the category that you want to put your User Guide in. You will see there are some sections that are not indented like the others. They are flush with the left side of the screen. **Do not change the indentation.** You can put markdown in these areas.
Once you've identified the non-indented area under the category you would like your User Guide to be under, you can use markdown to insert your link underneath the others. `[TITLE OF USER GUIDE](LINK-TO-USER-GUIDE.html)`. Please note that the file name in between the paranthases must be EXACTLY the same name as the file name you made in step 5.2, but with a `.html` at the end instead of `.md`.
Once you've identified the non-indented area under the category you would like your User Guide to be under, you can use markdown to insert your link underneath the others. `[TITLE OF USER GUIDE](LINK-TO-USER-GUIDE.html)`. Please note that the file name in between the parentheses must be EXACTLY the same name as the file name you made in step 5.2, but with a `.html` at the end instead of `.md`.
In the event that you think your User Guide should be in a new Category that doesn't exist yet, contact rehrar to make one for you.
......@@ -151,12 +155,10 @@ You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure
## 6.0 How to make a Moneropedia Entry
### 6.1 Quick Start
### 6.2 Make a file
### 6.1 Make a file
Navigate to the /resources/moneropedia folder and make a new file. Be sure the file name has no spaces and the ending is .md
### 6.3 Front Matter
### 6.2 Front Matter
```
---
layout: moneropedia
......@@ -168,13 +170,13 @@ summary: "PUT SUMMARY OF YOUR ENTRY HERE IN QUOTES"
There is one thing to highlight. The `terms:` section of the front matter can be filled with as many terms as you would like. This is how other Moneropedia entries will link to this page. You can link to other Moneropedia entries as well in your page by putting an ampersand before the term used, i.e. `@THE-TERM-USED`. This will make an automatic link in the Moneropedia entry to the referred term, replace the @term with the word used in that terms `entry:` area of the front matter, and on hover it will show the summary. How cool is that?
### 6.4 Write
### 6.3 Write
Write your Moneropedia entry. Remember that you can link to other Moneropedia entries using `@term-used-in-entry` as described above. Just go to the .md file of the Moneropedia entry you want to link to and use any of the terms in the `terms:` field of the front matter. Be sure to write whichever one you choose EXACTLY as shown and preceded by an ampersand.
### 6.5 Build/Test
### 6.4 Build/Test
Build your website using `jekyll serve` if it's not rebuilding automatically and test check the link to your entry is appearing on the alphabetical list of Moneropedia entries and that it leads to your entry when clicked. Test your Moneropedia entry in the browser and contact rehrar if there are any bugs.
### 6.6 Submit Pull Request
### 6.5 Submit Pull Request
You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure to make any changes if requested.
## 7.0 How to make a FFS Proposal
......@@ -296,9 +298,9 @@ and paste it IN THE CHRONOLOGICAL ORDER that it will be in. So if there is an ev
Fill in the data as follows:
* `event:` The name of the event goes here as well as the date. The recommended format is: `Event Name - January 1st, 2000`
* `where:` Where the event will take place. Vanue name and address are recommended.
* `where:` Where the event will take place. Venue name and address are recommended.
* `when:` Date and time
* `description:` Descriptoin of the happenings of your event
* `description:` Description of the happenings of your event
* `link:` The website of your event (if applicable, this can be left blank and everything will be ok). This link must have http:// at the beginning if it is an external link.
**Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
......@@ -326,7 +328,7 @@ Find the year that you want to update and copy the code below:
date:
status:
```
and paste it in the correct years `accomplishments:` section IN THE CHRONOLOGICAL ORDER that it will be in. So if there is a accomplishment that happened/is happening before the one you are inputting, make sure it is higher up than yours. If there is an accomplishment that happened/is happening AFTER yours, make sure it is after yours. If you don't have exact dates, just do your best to estimate.
and paste it in the correct year's `accomplishments:` section IN THE CHRONOLOGICAL ORDER that it will be in. So if there is a accomplishment that happened/is happening before the one you are inputting, make sure it is higher up than yours. If there is an accomplishment that happened/is happening AFTER yours, make sure it is after yours. If you don't have exact dates, just do your best to estimate.
Fill in the data as follows:
* `name:` The name of the accomplishment. Try to keep it short, a sentence or two at most.
......@@ -360,7 +362,7 @@ Find the category that best describes your business/service and copy the code be
and paste it in the correct category under the `merchants:` section.
Fill in the data as follows:
* `name:` The name of the the business/service.
* `name:` The name of the business/service.
* `url:` The external url of the business/service. This link must have http:// (or https://) at the beginning if it is an external link.
**Make sure the indentation is EXACTLY the same as the other proposals in the area. If it's not the jekyll build WILL fail.**
......@@ -378,7 +380,7 @@ You're all done. Submit a PR and wait for it to be reviewed and merged. Be sure
## 12.0 How to add a question to the FAQ
### 12.1 Copy/Paste Code
Navigate to the `/get-started/faq` folder and open the `index.md` file. Inside you will see HTML code, but you will see it is very repetetive.
Navigate to the `/get-started/faq` folder and open the `index.md` file. Inside you will see HTML code, but you will see it is very repetitive.
Copy the code below:
```
......@@ -394,7 +396,7 @@ CHANGE ANSWER
</div>
```
And paste it at the very bottom of the file. Literally underneath everything else.
And paste it at the very bottom of the file (literally underneath everything else).
Now we're going to change just a couple of things. Find the section with:
```
......@@ -430,4 +432,4 @@ Redistribution and use in source and binary forms, with or without modification,
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
......@@ -75,6 +75,15 @@
tag: Wolfram Warptangent
blockchain: freebsd
- platform: DragonflyBSD, 64-bit
id: bsd
icon: icon-dragonflybsd
cli_url: dragonflybsd64
cli_hash: c25c0f603ca5c96cb5963aaa2905edff390b7a97f654106911ffad8639deee7c
version: 0.10.3.1
tag: Wolfram Warptangent
blockchain: freebsd
- platform: Source Code & Blockchain
id: source
icon: icon-github
......@@ -86,4 +95,4 @@
id: mobilelight
- platform: Hardware Wallets
id: hardware
\ No newline at end of file
id: hardware
- channel: monero
description: This channel is used to discuss all things Monero related.
- channel: monero-community
description: This channel is for the Monero community to congretate and discuss ideas.
- channel: monero-dev
description: The many contributors and developers come here to discuss dev-y things.
- channel: monero-ffs
description: Regarding the Monero forum funding system.
- channel: monero-markets
description: We use this channel to talk about the price of Monero and other coins.
- channel: monero-offtopic
description: Chatting with other Monero users about things not related to Monero.
- channel: monero-otc
description: Over the counter Monero. Come here to purchase XMR from your fellow Moneron.
- channel: monero-pools
description: This is the place for mining questions and discussion.
- channel: monero-research-lab
description: Research into financial privacy with cryptocurrency.
- channel: monero-translations
description: Localizing Monero into other languages
- channel: monero-website
description: For the development of the Monero website
\ No newline at end of file
......@@ -2,10 +2,14 @@
merchants:
- name: "#monero-otc (OTC)"
url: https://webchat.freenode.net?channels=%23monero-otc
- name: Bitsquare (decentralized)
url: https://bitsquare.io/
- name: Alfacashier
url: https://www.alfacashier.com/
- name: Bitfinex (XMRUSD, XMRBTC)
url: https://www.bitfinex.com/
- name: Bisq; decentralized exchange (previously Bitsquare)
url: https://bisq.io/
- name: BitMEX
url: https://www.bitmex.com/app/trade/XMR7D
url: https://www.bitmex.com/app/trade/XMR7D
- name: Bittrex
url: https://www.bittrex.com/Market/Index?MarketName=BTC-XMR
- name: Bter
......@@ -14,10 +18,18 @@
url: https://www.coincut.com
- name: Cryptopia
url: https://www.cryptopia.co.nz/Exchange?market=XMR_BTC
- name: Kaiserex
url: https://www.kaiserex.com/
- name: Kraken (XMRUSD, XMREUR, XMRBTC)
url: https://www.kraken.com/
- name: Liberalcoins
url: https://liberalcoins.com/
- name: Livecoin (BTC and USD trading pairs)
url: https://www.livecoin.net
- name: LiteBit (Bankwire/GiroPay/iDeal/SOFORT)
url: https://www.litebit.eu/en/buy/monero
- name: Magnetic Exchange
url: https://magneticexchange.com
- name: MoneroDirect (Euro only)
url: https://monerodirect.com
- name: Poloniex
......@@ -26,20 +38,6 @@
url: https://shapeshift.io/
- name: Tux Exchange
url: https://www.tuxexchange.com/trade?coin=XMR&market=BTC
- name: Bitfinex (XMRUSD, XMRBTC)
url: https://www.bitfinex.com/
- name: Alfacashier
url: https://www.alfacashier.com/
- name: Kraken (XMRUSD, XMREUR, XMRBTC)
url: https://www.kraken.com/
- name: BIT.AC
url: https://bit.ac/
- name: Kaiserex
url: https://www.kaiserex.com/
- name: Magnetic Exchange
url: https://magneticexchange.com
- name: ArbitrCoin
url: https://arbitrcoin.com
- category: Block Explorers
merchants:
- name: ChainRadar
......@@ -53,122 +51,132 @@
- name: xmrchain.net
url: https://xmrchain.net/
- category: Payment Gateways
merchants:
merchants:
- name: GloBee
url: https://globee.com/
- name: Living Room of Satoshi
url: https://www.livingroomofsatoshi.com/?sc=xmr
url: https://www.livingroomofsatoshi.com/?sc=xmr
- name: Monero Merchants
url: https://monero-merchants.com
- name: Paybee (Private Beta)
url: https://payb.ee/
- name: Monero WooCommerce Extension (PHP)
url: https://github.com/monero-integrations/monerowp
- category: Libraries and Helpers
merchants:
- name: Monero Integrations (eCommerce plugins)
url: http://monerointegrations.com/
- name: monero-nodejs (Node.js)
url: https://github.com/PsychicCat/monero-nodejs
- name: python-monero (Python)
url: https://github.com/tippero/python-monero
- name: MoneroPy (Python)
url: https://github.com/bigreddmachine/MoneroPy
- name: moneronjs (NodeJS)
url: https://github.com/netmonk/moneronjs
- name: MoneroApi.Net (.NET)
url: https://github.com/Jojatekok/MoneroApi.Net
- name: xmr-integration (PHP)
url: https://github.com/TheKoziTwo/xmr-integration
- name: PHP-Monero (PHP)
url: https://github.com/MalMen/PHP-Monero
- name: Monero-PHP (PHP)
url: https://github.com/PsychicCat/monero-php
- name: moneronjs (NodeJS)
url: https://github.com/netmonk/moneronjs
- name: Monero Payments Library (PHP)
url: https://github.com/monero-integrations/monerophp
- name: Monero-PHP (PHP)
url: https://github.com/PsychicCat/monero-php
- name: MoneroPy (Python)
url: https://github.com/bigreddmachine/MoneroPy
- name: PHP-Monero (PHP)
url: https://github.com/MalMen/PHP-Monero
- name: python-monero (Python)
url: https://github.com/tippero/python-monero
- name: xmr-integration (PHP)
url: https://github.com/TheKoziTwo/xmr-integration
- category: Tools
merchants:
- name: nestorgames
url: http://www.nestorgames.com
- name: ForkGuard Network Monitoring
url: http://forkguard.com
- name: MoneroBase Price Charts and Tools
url: http://monerobase.com
- name: Monero Monitor for Chrome
url: https://chrome.google.com/webstore/detail/monero-monitor/ojekadcfnkkihlleaafggfgbggdckpgo
- name: MoneroPric.es Price Converter
url: https://moneropric.es
- name: MoneroPrice.com Price Converter
url: http://moneroprice.com/
- name: nestorgames
url: http://www.nestorgames.com
- name: Offline Monero address generator
url: https://moneroaddress.org/
- name: Monero Monitor for Chrome
url: https://chrome.google.com/webstore/detail/monero-monitor/ojekadcfnkkihlleaafggfgbggdckpgo
- category: Services
merchants:
- name: algoStrategic - Internet Marketing and Web Development
url: https://algostrategic.com
- name: Azur Samui - Luxury Apartment and Villa Development, Koh, Samui, Thailand
url: http://www.azursamui.com
- name: California Fintech Network
url: https://www.californiafintech.org/plans/
- name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow
url: mailto:[email protected]
name: Computer Lab - React, Django, Security Consultancy in NYC
url: https://computerlab.io
- name: cloakVPN.com
url: https://cloakVPN.com
- name: Cryptostorm VPN
url: https://cryptostorm.is/
- name: Elise Hawkins Nutritional Therapy
url: www.elisehawkinsnutritionaltherapy.com
- name: Emmanuel Galang, Canada Immigration and Refugee Lawyer
url: https://galanglaw.com/
- name: Esperanto lessons from Kaja
url: mailto:[email protected]
- name: Farmer ALP, LLC, Arizona
url: mailto:[email protected]
- name: Flokinet.is
url: https://flokinet.is
- name: Guitar Music Theory course w/ 30% XMR discount
url: http://www.guitartheoryrevolution.info/blog/guitar-theory-revolution-store/
- name: Infield Loan Services - Atlanta, Construction Consulting, Contract review, Feasibility, Funds Escrow
url: mailto:[email protected]
- name: MSvB Hardware Design (using a secure element)
url: mailto:[email protected]?subject=Monero%20Services%20Hardware%20Design%20Request
- name: MyMonero Web-based Wallet
url: https://mymonero.com
- name: Nerdzy Lawn Care
url: http://www.nerdzy.net
- name: NiceVPS - VPS and web hosting
url: https://nicevps.net/
- name: Njalla - privacy-aware domain registration
url: https://njal.la/
- name: Pradeep Atluri, Psychiatrist, New York
url: http://dr.mindsci.com/
- name: Simple, no non-sense hosting
- name: Rootbox; Simple, no non-sense hosting
url: https://rootbox.host/
- name: Web Developer - Python with Django web framework
url: http://www.voteforrodneylewis.com
- name: Web Developer - Stefanos
url: http://www.stefanosioannou.com/web-development-monero-accepted
- name: XMR.to Monero to Bitcoin Payment Service
url: https://xmr.to
- name: algoStrategic - Internet Marketing and Web Development
url: https://algostrategic.com
- name: Emmanuel Galang, Canada Immigration and Refugee Lawyer
url: https://galanglaw.com/
- name: Web Developer - Python with Django web framework
url: http://www.voteforrodneylewis.com
- name: FlokiNET
url: https://flokinet.is
- name: Nerdzy Lawn Care
url: http://www.nerdzy.net
- name: Njalla - privacy-aware domain registration
url: https://njal.la/
url: https://xmr.to/
- category: Goods
merchants:
- name: Cellphone and laptop repair online store in Sweden
url: http://www.LagaiPhone.se
- name: CryptoMercado - coffee and snacks
url: https://www.cryptomercado.com/
- name: Cryptonic Physical Monero & Bitcoin coins
url: https://cryptonic.net
- name: Fine Art from Jeanine King ~ Artwork of Home/Archtecture, Pets, Potraits, Caricatures ~ International Shipping
url: http://art2unlimited.webs.com/
- name: Digital gift cards
url: https://giftoff.com/
- name: Mushroom cultures, mushroom growing supplies, seeds
url: https://www.vesp.co/Fungible
- name: Directvoltage
url: http://directvoltage.com
- name: Fine Art from Jeanine King ~ Artwork of Home/Archtecture, Pets, Potraits, Caricatures ~ International Shipping
url: http://art2unlimited.webs.com/
- name: Handcrafted goods
url: https://mychain.store/
- name: Cellphone and laptop repair online store in Sweden
url: http://www.LagaiPhone.se
- name: InvestmentArt
url: http://investmentart.org/
- name: Directvoltage
url: http://directvoltage.com
- name: Synntech Gaming
url: https://synntechgaming.com
- name: Elise Hawkins Nutritional Therapy
url: www.elisehawkinsnutritionaltherapy.com
- name: Mushroom cultures, mushroom growing supplies, seeds
url: https://www.vesp.co/Fungible
- name: SilverRound.com - Gold and Silver Dealer
url: https://silverround.com/
- name: Synntech Gaming
url: https://synntechgaming.com
- category: Entertainment
merchants:
- name: Crypto Games
url: https://www.crypto-games.net/
- name: MoneroDice
url: https://monerodice.net
- name: SafeDice
url: https://safedice.com
- name: Crypto Games
url: https://www.crypto-games.net/
- name: XMRLotto.com
url: https://xmrlotto.com
......@@ -47,7 +47,7 @@
<ul class="list-unstyled list-inline">
<li><a href="/legal/" class="white footer-link">Legal</a></li>
<li><a href="https://github.com/monero-project" class="white footer-link">Source Code</a></li>
<li><a href="#" class="white footer-link">Coin Specs</a></li>
<li><a href="/resources/technical-specs/" class="white footer-link">Technical Specs</a></li>
</ul>
</div>
</div>
......@@ -58,4 +58,4 @@
<!-- JS -->
<script src="//static.getmonero.org/scripts.js"></script>
{% include hostflag.html %}
\ No newline at end of file
{% include hostflag.html %}
......@@ -60,6 +60,8 @@
<a href="/resources/moneropedia/">Moneropedia</a>
<a href="/resources/user-guides/">User Guides</a>
<a href="/resources/developer-guides/">Developer Guides</a>
<a href="/resources/vrp/">Vulnerability Response</a>
<a href="/resources/technical-specs/">Technical Specs</a>
</div>
</div>
</div>
......@@ -147,6 +149,8 @@
<a href="/resources/moneropedia/">Moneropedia</a>
<a href="/resources/user-guides/">User Guides</a>
<a href="/resources/developer-guides/">Developer Guides</a>
<a href="/resources/technical-specs/">Technical Specs</a>
<a href="/resources/vrp/">Vulnerability Response</a>
</div>
</div>
</div>
......
......@@ -9,14 +9,58 @@ layout: base
</div>
<!-- FULL WIDTH BLOCK -->
<section class="container full">
<div class="info-block text-adapt complete">
<div class="row center">
<div class="col-xs-12">
<h2>Progress</h2>
</div>
</div>
<div class="row center-xs">
<div class="col-xs-12 progress-numbers">
<p class="progress-number-funded">100 XMR </p><span> /</span>
<p class="progress-number-goal">100 XMR</p>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<div class="progress-bar">
<span style="width: 100%"></span>
</div>
</div>
<div class="col-xs-12 ffs-status">
<p>This project has been completed. The proposal is kept here both to celebrate the achievements of the Monero community, and for historical accuracy about what was accomplished.</p>
</div>
</div>
{% if page.milestones != nil %}
<div class="row center-xs milestones">
<div class="tab col-xs-12">
<input id="tab-one" type="checkbox" name="tabs" class="accordion">
<label for="tab-one" class="accordion">Milestones</label>
<div class="tab-content">
{% for milestones in page.milestones %}
<div class="row start-xs roadmap">
<div class="col-xs-1">
<span class="{{milestones.status}} ms-{{milestones.status}}"></span>
</div>
<div class="col-xs-11">
<p>{{milestones.name}}</p>
<p><span class="bold">Funds Awarded:</span> {{milestones.funds}}</p>
{% if milestones.done != nil %}
<p><span class="bold">Completion date:</span> {{milestones.done}}</p>
{%endif%}
</div>
</div>
{%endfor%}
</div>
</div>
</div>
{%endif%}
</div>
<div class="info-block text-adapt">
<div class="row center-xs">
<div class="col">
<h2>{{page.title}}</h2>
<p>by {{page.author}}</p>
<div class="ffs-status complete">
<p>This project has been completed. The proposal is kept here both to celebrate the achievements of the Monero community, and for historical accuracy about what was accomplished.</p>
</div>
</div>
</div>
<div>
......@@ -25,6 +69,18 @@ layout: base
</div>
</section>
<!-- END FULL WIDTH BLOCK -->
</div>
<!-- JAVASCRIPT FOR DISQUS -->
\ No newline at end of file
<section class="container full comments">
<div class="info-block">
<div class="row center">
<div class="col-xs-12">
<h2>Comments</h2>
</div>
</div>
<div class="row">
<div class="col-xs-12">
<!-- SPACE RESERVED FOR COMMENT SYSTEM -->
</div>
</div>
</div>
</section>
</div>
\ No newline at end of file