Starting to flesh out the static PCjs website

README.md

@@ -355,9 +355,9 @@ All published portions are free for redistribution and/or modification under the
 [GNU General Public License](/LICENSE) as published by the Free Software Foundation, either version 3 of the License,
 or (at your option) any later version.
 
-You are required to include the following copyright notice, with a link to [http://pcjs.org]():
+You are required to include the following copyright notice, with a link to [{{ site.pcjs_domain }}]({{ site.url }}):
 
-> [PCjs](http://pcjs.org) © 2012-2015 by [Jeff Parsons](mailto:Jeff@pcjs.org) ([@jeffpar](http://twitter.com/jeffpar))
+> [PCjs]({{ site.url }}) © 2012-2015 by [Jeff Parsons](mailto:Jeff@pcjs.org) ([@jeffpar](http://twitter.com/jeffpar))
 
 in every source code file of every copy or modified version of this work, and to display that notice on every web page
 or computer that runs any version of this software.

_config.yml

@@ -18,5 +18,5 @@ kramdown:
   hard_wrap: false
 
 # Custom site settings
-pcjs_sitename: pcjs.net
+pcjs_domain: pcjs.net
 pcjs_version: 1.20.1

_includes/footer.html

@@ -10,6 +10,8 @@
         </ul>
       </div>
 
+      {% comment %}
+      
       <div class="footer-col  footer-col-2">
         <ul class="social-media-list">
           {% if site.github_username %}
@@ -43,9 +45,11 @@
         </ul>
       </div>
 
+      {% endcomment %}
+      
       <div class="footer-col  footer-col-3">
         <p class="text">
-          <span style="float:right"><a href="http://pcjs.net">pcjs.net</a> website © 2012-2015 by <a href="http://twitter.com/jeffpar">@jeffpar</a></span><br/>
+          <span style="float:right"><a href="{{ site.url }}">{{ site.pcjs_domain }}</a> website © 2012-2015 by <a href="https://twitter.com/{{ site.twitter_username }}">@{{ site.twitter_username }}</a></span><br/>
           <span style="float:right">PCjs and C1Pjs released under <a href="http://gnu.org/licenses/gpl.html">GPL version 3 or later</a></span>
         </p>
       </div>

_includes/head.html

@@ -4,6 +4,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
     <meta name="description" content="{{ site.description }}">
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet" type="text/css">
     <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
     <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
     <link rel="apple-touch-icon" sizes="57x57" href="{{ site.baseurl }}/versions/icons/current/pc-icon-57.png">

_includes/machine-engines.html

@@ -1,10 +1,10 @@
 {% for machine in page.machines %}
-  {% capture machine_embed %}window.embed{{ machine.type | upcase }}{% endcapture %}
+  {% capture machine_embed %}window.embed{{ machine.type | remove:'-dbg' | upcase }}{% endcapture %}
   {% if machine.config %}{% capture machine_config %}{{ machine.config }}{% endcapture %}{% else %}{% assign machine_config = "machine.xml" %}{% endif %}
-  {% capture machine_template %}{{ site.baseurl }}/versions/{{ machine.type }}js/{{ site.pcjs_version }}/components.xsl{% endcapture %}
+  {% capture machine_template %}{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}/components.xsl{% endcapture %}
   {% capture machine_script %}/{{ machine.type }}.js{% endcapture %}
   {% unless machine_scripts contains machine_script %}
-    <script type="text/javascript" src="{{ site.baseurl }}/versions/{{ machine.type }}js/{{ site.pcjs_version }}{{ machine_script }}"></script>
+    <script type="text/javascript" src="{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}{{ machine_script }}"></script>
   {% endunless %}
   {% capture machine_scripts %}{{ machine_scripts }}{{ machine_script }}{% endcapture %}
     <script type="text/javascript">{{ machine_embed }}("{{ machine.id }}","{{ machine_config }}","{{ machine_template }}");</script>

_includes/machine-styles.html

@@ -1,5 +1,5 @@
 {% for machine in page.machines %}
-  {% capture machine_style %}{{ site.baseurl }}/versions/{{ machine.type }}js/{{ site.pcjs_version }}/components.css{% endcapture %}
+  {% capture machine_style %}{{ site.baseurl }}/versions/{{ machine.type | remove:'-dbg' }}js/{{ site.pcjs_version }}/components.css{% endcapture %}
   {% unless machine_styles contains machine_style %}
 	<link rel="stylesheet" type="text/css" href="{{ machine_style }}">
   {% endunless %}

_sass/_base.scss

@@ -2,7 +2,7 @@
  * Reset some basic elements
  */
 body, h1, h2, h3, h4, h5, h6,
-p, blockquote, pre, hr,
+p, blockquote, pre,
 dl, dd, ol, ul, figure {
     margin: 0;
     padding: 0;
@@ -111,9 +111,9 @@ blockquote {
     color: $grey-color;
     border-left: 4px solid $grey-color-light;
     padding-left: $spacing-unit / 2;
-    font-size: 18px;
+    /* font-size: 18px; */
-    letter-spacing: -1px;
+    /* letter-spacing: -1px; */
-    font-style: italic;
+    /* font-style: italic; */
 
     > :last-child {
         margin-bottom: 0;

_sass/_layout.scss

@@ -121,8 +121,8 @@
 }
 
 .footer-col-1 {
-    width: -webkit-calc(35% - (#{$spacing-unit} / 2));
+    width: -webkit-calc(40% - (#{$spacing-unit} / 2));
-    width:         calc(35% - (#{$spacing-unit} / 2));
+    width:         calc(40% - (#{$spacing-unit} / 2));
 }
 
 .footer-col-2 {
@@ -131,8 +131,8 @@
 }
 
 .footer-col-3 {
-    width: -webkit-calc(45% - (#{$spacing-unit} / 2));
+    width: -webkit-calc(60% - (#{$spacing-unit} / 2));
-    width:         calc(45% - (#{$spacing-unit} / 2));
+    width:         calc(60% - (#{$spacing-unit} / 2));
 }
 
 @include media-query($on-laptop) {

css/main.scss

@@ -3,10 +3,8 @@
 ---
 @charset "utf-8";
 
-
-
 // Our variables
-$base-font-family: Helvetica, Arial, sans-serif;
+$base-font-family: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif;
 $base-font-size:   16px;
 $small-font-size:  $base-font-size * 0.875;
 $base-line-height: 1.5;

devices/README.md

@@ -1,3 +1,9 @@
+---
+layout: page
+title: Machine Configurations
+permalink: /devices/
+---
+
 Machine Configurations
 ---
 

devices/c1p/README.md

@@ -1,3 +1,9 @@
+---
+layout: page
+title: Challenger 1P Machine Configurations
+permalink: /devices/c1p/
+---
+
 Challenger 1P Configurations
 ---
 

devices/c1p/machine/32kb/machine.md

@@ -0,0 +1,10 @@
+---
+layout: page
+title: "OSI Challenger 1P (32Kb) with Disk Support"
+permalink: /devices/c1p/machine/32kb/
+machines:
+  - type: c1p-dbg
+    id: c1p32kb
+---
+
+{% include machine.html id="c1p32kb" %}

devices/c1p/machine/README.md

@@ -1,3 +1,9 @@
+---
+layout: page
+title: Machines
+permalink: /devices/c1p/machine/
+---
+
 Challenger 1P Machine Configurations
 ---
 

devices/pc/README.md

@@ -1,4 +1,10 @@
-IBM PC Configurations
+---
+layout: page
+title: PC Machine Configurations
+permalink: /devices/pc/
+---
+
+PC Machine Configurations
 ---
 
 This folder contains IBM PC [Machine Configurations](machine/), along with [Control Panels](/devices/pc/panel/),

devices/pc/machine/5150/README.md

@@ -1,4 +1,10 @@
-IBM PC (Model 5150)
+---
+layout: page
+title: IBM PC Machines (Model 5150)
+permalink: /devices/pc/machine/5150/
+---
+
+IBM PC Machines (Model 5150)
 ---
 
 All our Model 5150 configurations of the IBM PC are located here.

devices/pc/machine/5150/mda/64kb/debugger/machine.md

@@ -0,0 +1,10 @@
+---
+layout: page
+title: "PCjs | IBM PC (Model 5150) with Monochrome Display"
+permalink: /devices/pc/machine/5150/mda/64kb/debugger/
+machines:
+  - type: pc-dbg
+    id: ibm5150
+---
+
+{% include machine.html id="ibm5150" %}

devices/pc/machine/5150/mda/64kb/machine.md

@@ -1,6 +1,6 @@
 ---
 layout: page
-title: "PCjs | IBM PC (Model 5150) with Monochrome Display"
+title: "IBM PC (Model 5150) with Monochrome Display"
 permalink: /devices/pc/machine/5150/mda/64kb/
 machines:
   - type: pc

devices/pc/machine/5150/mda/64kb/softkbd/machine.md

@@ -0,0 +1,10 @@
+---
+layout: page
+title: "PCjs | IBM PC (Model 5150) with Monochrome Display"
+permalink: /devices/pc/machine/5150/mda/64kb/softkbd/
+machines:
+  - type: pc-dbg
+    id: ibm5150
+---
+
+{% include machine.html id="ibm5150" %}

devices/pc/machine/5150/mda/README.md

@@ -1,3 +1,13 @@
+---
+layout: page
+title: IBM PC Machines (Model 5150) with Monochrome (MDA) Display
+permalink: /devices/pc/machine/5150/mda/
+machines:
+  - type: pc
+    id: ibm5150
+    config: /devices/pc/machine/5150/mda/64kb/machine.xml
+---
+
 IBM PC (Model 5150) with Monochrome (MDA) Display
 ---
 
@@ -7,4 +17,4 @@ Below is a 64kb configuration, with a clock speed of 4.77Mhz,
 using the original IBM PC Model 5150 ROM BIOS and MDA font ROM. For more control,
 use this [alternate configuration](/devices/pc/machine/5150/mda/64kb/debugger/) with Control Panel and Debugger.
 
-[IBM PC (Model 5150) with Monochrome Display and 64Kb](/devices/pc/machine/5150/mda/64kb/ "PCjs:ibm5150")
+{% include machine.html id="ibm5150" %}

devices/pc/machine/README.md

@@ -1,3 +1,10 @@
+---
+layout: page
+title: Machines
+menu_order: 5
+permalink: /devices/pc/machine/
+---
+
 IBM PC Machine Configurations
 ---
 

docs/about/README.md

@@ -9,7 +9,7 @@ permalink: /docs/about/
 
 The JavaScript Machines Project (originally at [jsmachines.net](http://jsmachines.net/)) is a collection of computer
 simulations written in JavaScript.  It has now been released on [GitHub](https://github.com/) as the
-[PCjs Project](https://github.com/jeffpar/pcjs), a copy of which is hosted here at [pcjs.org](http://www.pcjs.org/).
+[PCjs Project](https://github.com/jeffpar/pcjs), a copy of which is hosted here at [{{ site.pcjs_domain }}]({{ site.url }}).
 
 The goals of the project are to create fast, full-featured simulations of classic computer
 hardware, help people understand how these early machines worked, make it easy to experiment with different machine
@@ -28,7 +28,7 @@ The first JavaScript Machines simulation was [C1Pjs](/docs/c1pjs/), a simulation
 Challenger 1P, which was a 6502-based microcomputer introduced by Ohio Scientific in 1978.
 
 C1Pjs v1.0 was released in July 2012, first on ecpsim.org and cpusim.org, then on [jsmachines.net](http://jsmachines.net/c1pjs),
-and finally [pcjs.org](http://www.pcjs.org/). More information about the first release of C1Pjs was also 
+and finally [{{ site.pcjs_domain }}]({{ site.url }}). More information about the first release of C1Pjs was also 
 [posted](http://osiweb.org/osiforum/viewtopic.php?f=3&t=103) on the [OSI Discussion Forum](http://osiweb.org/osiforum/index.php)
 at [osiweb.org](http://osiweb.org/).
 
@@ -52,8 +52,8 @@ Read [About PCjs](/docs/about/pcjs/) to learn more about its history, features,
 
 ### Migrating to Node: The PCjs Project
 
-The JavaScript Machines Project was migrated to a [Node.js](http://nodejs.org) web server ([pcjs.org](http://www.pcjs.org/))
+The JavaScript Machines Project was migrated to a [Node.js](http://nodejs.org) web server in 2014, and became the
-in 2014, and became the PCjs Project.
+PCjs Project.
 
 The goals included:
 
@@ -75,9 +75,9 @@ All published portions are free for redistribution and/or modification under the
 [GNU General Public License](/LICENSE) as published by the Free Software Foundation, either version 3 of the License,
 or (at your option) any later version.
 
-You are required to include the following copyright notice, with a link to [http://pcjs.org]():
+You are required to include the following copyright notice, with a link to [{{ site.pcjs_domain }}]({{ site.url }}):
 
-> [PCjs](http://pcjs.org) © 2012-2015 by [Jeff Parsons](mailto:Jeff@pcjs.org) ([@jeffpar](http://twitter.com/jeffpar))
+> [PCjs]({{ site.url }}) © 2012-2015 by [Jeff Parsons](mailto:Jeff@pcjs.org) ([@jeffpar](http://twitter.com/jeffpar))
 
 in every source code file of every copy or modified version of this work, and to display that notice on every web page
 or computer that runs any version of this software.

docs/about/pcjs/README.md

@@ -1,3 +1,9 @@
+---
+layout: page
+title: About PCjs
+permalink: /docs/about/pcjs/
+---
+
 About PCjs
 ---
 

modules/pcjs/templates/components.css

@@ -14,6 +14,9 @@
 .pcjs-embed:after {
     clear:both;
 }
+.pcjs-machine {
+    padding-bottom: 1em;
+}
 .pcjs-name, .pcjs-menu {
     clear: both;
     font-weight: bold;

versions/pcjs/1.20.1/components.css

@@ -1,6 +1,5 @@
 @CHARSET "UTF-8";
 
-
 *:not(input,textarea) {
     -webkit-user-select: none;
 }
@@ -9,6 +8,9 @@
 .pcjs-embed:after {
     clear:both;
 }
+.pcjs-machine {
+    padding-bottom: 1em;
+}
 .pcjs-name, .pcjs-menu {
     clear: both;
     font-weight: bold;