Overhaul website (again)

No more empty promises.

_config.yml

@@ -21,7 +21,7 @@ gaaccount: ''
 # Set this to your disqus shortname to enable comments. Note that the 'comments'
 # setting below must also be true. Individual posts can override 'comments' to
 # disable on a post-by-post basis
-disqus: 'codewarrior0'
+disqus: 'mcedit'
 comments: true
 
 permalink: /:year/:month/:title

_includes/header.html

@@ -25,18 +25,21 @@
                   <span class="icon-bar"></span>
                 </button>
                 <a class="navbar-brand" href="{{ site.baseurl }}/">
-                    <img id="navbar-icon" src="images/icon_new.png">{{ site.name }}
+                    <img id="navbar-icon" src="/images/icon_new.png">{{ site.name }}
                 </a>
               </div>
               <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav">
                     <li class="active"><a href="{{ site.baseurl }}/">Home</a></li>
                     <li class="active visible-xs-block"><a href="{{ site.baseurl }}/links.html">Links</a></li>
-                    <li class="active"><a href="{{ site.baseurl }}/archive.html">Archive</a></li>
                     <li class="active"><a href="{{ site.baseurl }}/about.html">About</a></li>
+                    <li class="active"><a href="https://github.com/{{ site.github }}/issues">Report Issue</a></li>
                     {% if site.github != '' %}
-                      <li class="active"><a href="https://github.com/{{ site.github }}">Github</a></li>
+                      <li class="active"><a href="https://github.com/{{ site.github }}">Develop</a></li>
                     {% endif %}
+                    <li class="active"><a href="http://khroki.github.io/MCEdit-Unified/">MCEdit 1.x</a></li>
+                    <li class="active"><a href="http://www.patreon.com/mcedit2" style="color:#77FF77">Donate</a></li>
+
                 </ul>
               </div>
         </div>

_includes/links-list.html

@@ -1,7 +1,7 @@
 <h1>Links</h1>
 <ul>
-  <li><a href="#">One</a></li>
-  <li><a href="#">Two</a></li>
-  <li><a href="#">Three</a></li>
-  <li><a href="#">Four</a></li>
+  <li><a href="https://github.com/{{ site.github }}/issues">Report an issue</a></li>
+  <li><a href="http://www.patreon.com/mcedit2">Donate via Patreon</a></li>
+  <li><a href="http://khroki.github.io/MCEdit-Unified/">MCEdit 1.x (legacy codebase)</a></li>
+  <li><a href="http://minecraft.net">Play Minecraft</a></li>
 </ul>

_includes/sidebar.html

@@ -1,9 +1,18 @@
 <div class="sidebar well">
 
-<a href="http://github.com/mcedit/mcedit2/releases" class="btn btn-default btn-download">
-    <span class="glyphicon glyphicon-download-alt" aria-hidden="true"
-          style="margin-right:10px"></span>Download MCEdit</a>
+    <a href="http://github.com/mcedit/mcedit2/releases" class="btn btn-default btn-download">
+        <span class="glyphicon glyphicon-download-alt" aria-hidden="true"
+              style="margin-right:10px"></span>Download MCEdit</a>
+    <div class="latest-version">
+        Latest version: <em>Tech Demo</em>
+    </div>
+    <ul class="dl-links">
+        <li class="li-icon-windows">
+            <a href="https://github.com/mcedit/mcedit2/releases/download/v2.0-tech-demo/mcedit2-tech-demo-win-amd64.exe">Windows (64-bit only)</a>
 
+        </li>
+
+    </ul>
 </div>
 
 <div class="sidebar well">
@@ -13,8 +22,17 @@
           <li><a href="{{ site.baseurl}}{{ post.url }}">{{ post.title }}</a></li>
         {% endfor %}
     </ul>
+    <a href="{{ site.baseurl }}/archive.html">Post Archive</a>
+
 </div>
 
 <div class="sidebar well">
 {% include links-list.html %}
 </div>
+
+<div class="sidebar well">
+<div class="twitter-feed">
+      <a class="twitter-timeline" data-dnt="true" href="https://twitter.com/codewarrior0" data-widget-id="400404263072849920">Tweets by @codewarrior0</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+  </div>
+</div>

_layouts/post.html

@@ -8,7 +8,8 @@
         <div class="col-md-9">
           <div class="article">
             <div class="">
-                <h1><a href="{{ site.baseurl}}{{ page.url }}">{{ page.date | date: "%b %-d, %Y" }} - {{ page.title }}</a></h1>
+                <h1><a href="{{ site.baseurl}}{{ page.url }}">{{ page.title }}</a></h1>
+                <time>{{ page.date | date: "%b %-d, %Y" }}</time>
             {% if site.comments == true and page.comments == true and site.disqus != '' %}
                 <p class="author"><a href="#disqus_thread">Comments</a></p>
             {% endif %}

_posts/2014-12-28-mcedit2-tech-demo.md

@@ -0,0 +1,10 @@
+---
+layout: post
+title: "MCEdit 2.0 Technology Demo"
+date: 2014-12-28 20:40:00 -1000
+comments: true
+---
+
+A demo of technologies used in MCEdit 2.0 is available for download from the links to the left.
+
+Note that this is a very early version of the software. There are bugs everywhere and most of the important features are missing. <em>Do not use this version for any serious work.</em> Don't bother reporting any bugs either, I already know about them. <small>(Actually, you can report if the app doesn't even open, as long as you attach your `mcedit.log` file in a [pastebin](http://pastebin.com) or something)</small>

about.html

@@ -1,8 +0,0 @@
----
-layout: default
----
-
-<div class="well">
-    <h1>About me</h1>
-    <p>Hello, I am me.</p>
-</div>

about.md

@@ -0,0 +1,40 @@
+---
+layout: default
+title: About MCEdit 2.0
+---
+
+# {{ page.title }}
+
+MCEdit 2 is an open source world editor for the popular game Minecraft. MCEdit 2 is currently in pre-alpha and most
+of the following features have not yet been restored. (Check back again soon!)
+
+MCEdit was first created to allow players to
+preserve anything built with several old versions of Minecraft and take them forward into newer versions of the game. It also aims to be forward-compatible with future (or even modified) versions of Minecraft. It has since been improved with brush tools for laying down blocks in different shapes, integration with the Minecraft Server to generate terrain using Minecraft’s own seed algorithms, support for multiplayer worlds, and editors for certain blocks including chests and mob spawners.
+
+## Features:
+
+* Navigate the world using familiar WASD controls and mouse aiming.
+* Show the locations of dropped items, game entities including monsters and villagers, hidden ores, plus blocks with TileEntities and other Minecraft internals.
+* Load saved games from current Minecraft versions, plus the older Classic and Indev versions.
+* Limited support for Minecraft Pocket Edition saved games
+* Export blocks and game entities as a .schematic file to be imported by MCEdit or compatible programs.
+* Automatically fixes wool colors when importing and exporting between Minecraft PC, Classic, and Pocket editions!
+* Double-click on a chest to change its contents, or double-click on a mob spawner to choose what spawns.
+* Brush tool “paints” blocks in a round, diamond, or square shape with configurable size. Different brush modes will add new blocks, replace blocks, alter the top layer of the terrain or wear it down to smooth out rough objects.
+* “Paste” brush allows you to import an object with a single click.
+* “Flood Fill” brush will change all blocks that form a connected mass.
+* Clone tool makes a copy of blocks and entities, optionally making multiple clones in a line or scaling the copy up or down.
+* Clone and Import tools can rotate an object around any axis, or flip it horizontally or vertically.
+* “Filter” plugins let users add functionality to MCEdit by writing Python code.
+* Move the world’s spawn point, automatically removing blocks to make sure the spawn point is acceptable to Minecraft.
+* Move and rotate any player in a single- or multiplayer world.
+* Expand or contract the world’s size by adding or deleting chunks. Chunks are the basis of Minecraft’s “infinite” saved game format.
+* Create new worlds or add chunks to existing worlds. The Minecraft Server can be harnessed to create natural terrain that meshes with the world’s existing seed. Flatlands can also be created at any height.
+*“Analyze” feature counts the block and entity types in a selected area, optionally saving them to a .csv file.
+* Maintenance commands can delete all blocks, entities, or chunks in a selected region. This is useful for getting a “corrupted” world back into a playable state.
+
+<a href="#" class="thumbnail">
+    <img src="/images/screenshots/techdemo.png" alt="...">
+</a>
+
+

archive.html

@@ -2,7 +2,7 @@
 layout: default
 ---
 
-<div class="well">
+<div class="">
 {%for post in site.posts %}
     {% unless post.next %}
         <h1>{{ post.date | date: '%Y' }}</h1>

css/mcedit.css

@@ -2,15 +2,21 @@
     color: #115511;
 }
 
-body {
-    padding-top: 90px;
-}
 .navbar-brand, .navbar-nav > li > a {
-    line-height: 45px;
-    font-size: 150%;
+    font-size: 120%;
 }
+.navbar-brand {
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+.navbar-inverse .navbar-brand {
+    color: #DDD;
+}
+
 #navbar-icon {
     margin: 0.25em;
+    padding-right: 5px;
 }
 
 .btn-download {
@@ -23,3 +29,28 @@ a.btn-download {
     color: white;
 
 }
+/* --- download links --- */
+.latest-version {
+    margin: 12px;
+}
+.dl-links {
+    list-style: none;
+}
+
+.dl-links li {
+    line-height: 26px;
+    padding-left: 26px;
+}
+/* --- icons --- */
+
+.li-icon-windows {
+    background: url("/images/icon-windows.png") 0 2px no-repeat;
+}
+
+.li-icon-linux {
+    background-image: url("/images/icon-linux.png")
+}
+
+.li-icon-apple {
+    background-image: url("/images/icon-apple.png")
+}

index.html

@@ -1,11 +1,21 @@
 ---
 layout: default
 ---
-
+<div>
+    <h1>MCEdit: World Editor for Minecraft</h1>
+    <img src="/images/icon_new.png" class="pull-left" style="margin: 5px">
+    MCEdit is a saved game editor for Minecraft. Since Minecraft saved games contain every single element of the
+    world the player is playing in, it has much more in common with 3D world, map, and terrain editors than
+    traditional saved game editors. MCEdit has been developed since 2010 with the original goal of allowing Classic
+    levels to be played in the full version of Minecraft, but has since evolved into a full featured editor and is
+    currently undergoing a thorough rewrite for version 2.0.
+</div>
+<hr>
 {% for post in paginator.posts %}
 <div class="article">
     <div class="">
-        <h1><a href="{{ site.baseurl}}{{ post.url }}">{{ post.date | date: "%b %-d, %Y" }} - {{ post.title }}</a></h1>
+        <h1><a href="{{ site.baseurl}}{{ post.url }}">{{ post.title }}</a></h1>
+        <time>{{ post.date | date: "%b %-d, %Y" }}</time>
         {% if site.comments == true and post.comments == true and site.disqus != '' %}
           <p class="author"><a href="{{ site.baseurl }}{{ post.url }}/#disqus_thread">Comments</a></p>
         {% endif %}
@@ -29,3 +39,15 @@ layout: default
     <a class="btn btn-default" href="{{ site.baseurl}}/page{{ paginator.next_page }}" class="next">Older</a>
   {% endif %}
 </div>
+<div class="google-ads">
+    <script type="text/javascript"><!--
+    google_ad_client = "ca-pub-2531273453064153";
+    /* MCEdit.net front page ad */
+    google_ad_slot = "9311625741";
+    google_ad_width = 336;
+    google_ad_height = 280;
+    //-->
+    </script>
+    <script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+    </script>
+</div>