Merge pull request #420

86443683 Modified post layout with correct date formatting

1013a544 Added dates in correct format and removed hard coded dates.

5827b461 - Updated events page

7daf9dc6 - Removed some IRC channels from Hangouts page

f5464b23 - Updated README with a few more instructions

README.md

@@ -32,9 +32,9 @@ Copyright (c) 2014-2017, The Monero Project
 
 ## 1.0 Introduction
 
-Greetings everyone, this is rehrar. I'm here to walk you through everything you need to know to make changes, edits, or even completely new pages for the new [getmonero.org website](https://getmonero.org/). It'll definitely be a bit of a ride, so strap yourself in. Please note that translations are not available yet, but when they are added, this document will be updated with instructions on how to translate the content of [getmonero.org](https://getmonero.org/). In the meantime, any help translating this document into another language is greatly appreciated.
+This README here to walk you through everything you need to know to make changes, edits, or even completely new pages for the new [getmonero.org website](https://getmonero.org/). It'll definitely be a bit of a ride, so strap yourself in. Please note that translations are not available yet, but when they are added, this document will be updated with instructions on how to translate the content of [getmonero.org website](https://getmonero.org/). In the meantime, any help translating this document into another language is greatly appreciated.
 
-Feel free to skip down to a relevant section if you already know what you need. So to go to the (ADD SECTION HERE) use your find function and type (THING TO TYPE HERE). 
+Feel free to skip down to a relevant section if you already know what you need. So to go to the 'How to make a User Guide' section use your find function and type '5.0'. 
 
 If for any reason you have questions or need to contact us, you can find us on the IRC channel #monero. We'll do whatever we can to help you.
 
@@ -68,11 +68,15 @@ This website is completely open-source however and anything and everything is av
 
 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.
+A few random points of note:
+
+- All external links must have http:// or https:// in front of them or they will not redirect properly.
+- If you want to add a new page to the navigation, you should note that there are two menus in `header.html`. One for mobile and one for desktop. Your page must be added in the appropriate place in BOTH navigations.
+- It is strongly strongly STRONGLY encouraged that you if you make a change, you - at the minimum - test it on your local machine before submitting a PR. Sometimes unexpected things may happen due to a change. If you change a page, check the whole page on multiple screen sizes and browsers to make sure there wasn't any collateral damage.
 
 ### 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.
+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 (rehrar, 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.)

_data/events.yml

-- event: Monero Meetup (Dublin, Ireland) - June 26th, 2017
-  where: J.W. Sweetman Craft Brewery, 1-2 Burgh Quay, Dublin 2, Dublin, Ireland
-  when: 7:00 PM - Monday, June 26, 2017
-  description: The meeting will cover the history of privacy and fungibility in Bitcoin, discuss several approaches to these problems, and explain how Monero achieves its privacy in detail. Justin will discuss the next steps in development going forward and the limitations compared to other coins. Finally, there will be a Q&A session after the meeting, where he can clear up some final thoughts.
-  link: https://www.meetup.com/Bitcoin-Dublin/events/240152422/
\ No newline at end of file
+- event: Monero Meetup (Minneapolis, Minnesota) - October 20th, 2017
+  where: University of Minnesota Campus, Bruininks Hall #312
+  when: 5PM CST, October 20, 2017
\ No newline at end of file

_data/irc.yml

@@ -4,8 +4,6 @@
   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
@@ -17,6 +15,4 @@
 - 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
+  description: Localizing Monero into other languages
\ No newline at end of file

_data/merchants.yml

 - category: Exchanges
+  id: exchanges
   merchants:
     - name: "#monero-otc (OTC)"
       url: https://webchat.freenode.net?channels=%23monero-otc
@@ -45,6 +46,7 @@
     - name: Tux Exchange
       url: https://www.tuxexchange.com/trade?coin=XMR&market=BTC
 - category: Block Explorers
+  id: block-explorers
   merchants:
     - name: ChainRadar
       url: http://chainradar.com/xmr/blocks
@@ -57,6 +59,7 @@
     - name: xmrchain.net
       url: https://xmrchain.net/
 - category: Payment Gateways
+  id: payment-gateways
   merchants:
     - name: GloBee
       url: https://globee.com/
@@ -67,6 +70,7 @@
     - name: Monero WooCommerce Extension (PHP)
       url: https://github.com/monero-integrations/monerowp
 - category: Libraries and Helpers
+  id: libraries
   merchants:
     - name: Monero Integrations (eCommerce plugins)
       url: http://monerointegrations.com/
@@ -91,6 +95,7 @@
     - name: Monero Utilities (golang)
       url: https://github.com/paxos-bankchain/moneroutil
 - category: Tools
+  id: tools
   merchants:
     - name: Atesti Data Timestamping
       url: http://atesti.mooo.com:8081
@@ -109,6 +114,7 @@
     - name: Offline Monero address generator
       url: https://moneroaddress.org/
 - category: Services
+  id: services
   merchants:
     - name: AirVPN
       url: https://airvpn.org/
@@ -163,6 +169,7 @@
     - name: XMR.to Monero to Bitcoin Payment Service
       url: https://xmr.to/
 - category: Goods
+  id: goods
   merchants:
     - name: All For Crypto
       url: https://allforcrypto.com
@@ -191,6 +198,7 @@
     - name: Xusah Boutique
       url: https://xusah.boutique/
 - category: Entertainment
+  id: entertainment
   merchants:
     - name: Crypto Games
       url: https://www.crypto-games.net/

_data/roadmap.yml

@@ -76,6 +76,9 @@
       date: 2017-09-15
       status: completed
     - name: 0MQ/ZeroMQ
+      date: September, 2017
+      status: completed
+    - name: Fluffy blocks
       date:
       status: ongoing
     - name: GUI port to android

_includes/footer.html

@@ -8,6 +8,7 @@
                             <li><a href="/resources/moneropedia/" class="white">Moneropedia</a></li>
                             <li><a href="/resources/developer-guides/" class="white">Developer Guides</a></li>
                             <li><a href="/resources/user-guides/" class="white">User Guides</a></li>
+                            <li><a href="https://getmonero.org/feed.xml" class="white">RSS Feed</a></li>
                         </ul>
                     </div>
                     <div class="col-sm-3 col-xs-6">
@@ -37,7 +38,7 @@
                             <li><a href="https://openalias.org" class="white">Open Alias</a></li>
                             <li><a href="https://getkovri.org" class="white">Kovri</a></li>
                             <li><a href="/resources/research-lab/" class="white">Monero Research Lab</a></li>
-                            <li><a href="#" class="white">Monero Press Kit</a></li>
+                            <li><a href="/press-kit/" class="white">Monero Press Kit</a></li>
                         </ul>
                     </div>
                 </div>

_layouts/post.html

@@ -27,11 +27,20 @@ layout: base
                 <div class="left two-thirds col-lg-8 col-md-8 col-sm-12 col-xs-12">
                     <div class="info-block">
                         <div class="row">
-                        <div class="col"><h2>{{ page.title }}</h2>
-                          <p class="author">{% t blog.author %}: {% if page.author %}{{page.author}}{% else %}{{site.author}}{% endif%}</p>
-                          <p id="post-meta">{% t blog.date %} : {{ page.date }}</p>
+                            <div class="col">
+                               <h2>{{ page.title }}</h2> 
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <p class="author">{% t blog.author %}: {% if page.author %}{{page.author}}{% else %}{{site.author}}{% endif%}</p>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <p>{{ page.date | date: '%B %d, %Y' }}</p>
+                            </div>
                         </div>
-                    </div>
                     <div>
                         {{content}}
                     </div>

_posts/2014-06-02-dev-diary-for-the-week-of-2014-06-02.md

@@ -6,8 +6,6 @@ tags: [dev diaries, mining, i2p, rpc, crypto]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*June 2nd, 2014*
-
 **RPC:** Neozaru and others have submitted pull requests to add RPC methods that were missing.
 
 **I2P:** libssu has been decoupled, and outstanding changes to master have been merged.

_posts/2014-06-02-monero-missive-for-the-week-of-2014-06-02.md

@@ -6,8 +6,6 @@ tags: [monero missives, branding, mining, compliance]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*June 2nd, 2014*
-
 This is the start of a slightly more formal way of keeping everyone updated as to what we're doing in Monero. On an ongoing weekly basis we'll post an update on what has happened over the past week, as well as a dev diary highlighting work done on major efforts. If you'd like to get involved with Monero don't ask for permission - just get stuck in:) Fork the repo, make changes, submit a pull-request, and let's discuss it.
 
 Also an important note on updates: Our policy is to only provide announcements on projects which are either complete or near completion. We'd like to focus on providing you with the most accurate and reliable news, without generating any type of investor hype or speculation. As Monero is still a project in its infancy, and there is a great deal of work still to be done, we want to make sure you are getting an honest overview of our ongoing progress.

_posts/2014-06-10-dev-diary-for-the-week-of-2014-06-10.md

@@ -6,7 +6,6 @@ tags: [dev diaries, mining, i2p, rpc, docs]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*June 10th, 2014*
 
 **RPC:** incoming_transfers is now available as a simplewallet RPC API call, and payment_id has been added as an optional argument to the transfer RPC API call. Neozaru also committed a large amount of additional functionality to the RPC API, including progress estimation to getinfo.
 

_posts/2014-06-10-monero-missive-for-the-week-of-2014-06-10.md

@@ -6,8 +6,6 @@ tags: [monero missives, conferences, exchanges, gui, usability]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*June 10th, 2014*
-
 Hello XMR users! Welcome to our second Monero Missives.
 
 **Major Updates**

_posts/2014-06-18-dev-diary-for-the-week-of-2014-06-16.md

@@ -6,8 +6,6 @@ tags: [dev diaries, usability, platforms, accounts, core]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*June 18th, 2014*
-
 **Core:** Checkpoint added at block 80 000
 
 **Core:** We've incorporated two changes from BBR - proper tx_pool handling, and a fix for the high number of orphans pool miners were experiencing. tx_pool handling is incomplete, as it is implemented by the daemon but the wallet is not, as yet, mempool aware.

_posts/2014-06-18-monero-missive-for-the-week-of-2014-06-16.md

@@ -6,8 +6,6 @@ tags: [monero missives, exchanges, research, usability, gui]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*June 18th, 2014*
-
 Hello, and welcome to our third Monero Missive.
 
 **Major Updates**

_posts/2014-07-06-dev-diary-for-the-week-of-2014-06-30.md

@@ -6,8 +6,6 @@ tags: [dev diaries, core, accounts]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*July 6th, 2014*
-
 **Core:** daemonizing changes are ready for testing: https://github.com/mikezackles/bitmonero/tree/daemonize
 
 **Core:** rpcwallet is ready for testing: https://github.com/tewinget/bitmonero/tree/rpcwallet

_posts/2014-07-06-monero-missive-for-the-week-of-2014-06-30.md

@@ -6,8 +6,6 @@ tags: [monero missives, research, usability, accounts, gui, conferences]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*July 6th, 2014*
-
 Hello, and welcome to our fifth Monero Missive!
 
 **Major Updates**

_posts/2014-07-13-dev-diary-for-the-week-of-2014-07-07.md

@@ -6,8 +6,6 @@ tags: [dev diaries, core, accounts, i2p, i8n, blockchaindb]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*July 13th, 2014*
-
 **Core**: major work has begun on moving to an embedded database. The ongoing progress on this can be followed here: https://github.com/tewinget/bitmonero/tree/blockchain
 
 **Core / Wallet**: both the new daemonized daemon and rpcwallet are nearing a stage where they can be merged into master. The final step is to finalise the daemonizing code in rpcwallet, in such a way that it acts the same as the daemon, and we can move from there.

_posts/2014-07-13-monero-missive-for-the-week-of-2014-07-07.md

@@ -6,8 +6,6 @@ tags: [monero missives, research, usability, external, funding, i8n]
 author: Riccardo Spagni (fluffypony)
 ---
 
-*July 13th, 2014*
-
 Hello, and welcome to our sixth Monero Missive!
 
 **Major Updates**

_posts/2014-12-15-dev-diary-for-the-week-of-2014-12-15.md

@@ -7,8 +7,6 @@ author: Riccardo Spagni (fluffypony)
 forum: https://forum.getmonero.org/1/news-and-announcements/115/monday-monero-missives-21-december-15th-2014
 ---
 
-*December 15th, 2014*
-
 **Account:** still more fixes to the restore paths and multi-lang mnemonics, known issues with UTF-8 on Windows remain
 
 **Core:** libunbound lookups moved to a thread in order to trap for failing / slow DNS lookups

_posts/2014-12-15-external-projects-for-the-week-of-2014-12-15.md

@@ -7,8 +7,6 @@ author: Riccardo Spagni (fluffypony)
 forum: https://forum.getmonero.org/1/news-and-announcements/115/monday-monero-missives-21-december-15th-2014
 ---
 
-*December 15th, 2014*
-
 **MyMonero:** due to a very broad DDoS attack at the data center in which MyMonero is hosted (not targeted at MyMonero) the service was offline on Sunday for a 12 hour stretch. We are putting some effort in place to ensure this does not happen again in future. New features added this past week: a "copy to clipboard" helper is now available on the right of your Monero address on your dashboard, as well as on the login key review screen and account details screen. In addition, clicking on a transaction in the dashboard or your transaction history screens will show additional details, such as the payment ID used.
 
 **ForkGuard:** added MyMonero.com and MoneroClub.com

_posts/2014-12-15-monero-missive-for-the-week-of-2014-12-15.md

@@ -7,8 +7,6 @@ author: Riccardo Spagni (fluffypony)
 forum: 
 ---
 
-*December 15th, 2014*
-
 Hello, and welcome to our twenty-first Monero Monday Missive!
 
 **Major Updates**