Add pretty url, change metadata to YAML

timvideos · May 25, 2014 · 4a99231 · 4a99231
1 parent b16effb
commit 4a99231
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 66 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 _site
+_posts
diff --git a/FAQ.md b/FAQ.md
@@ -1,8 +1,8 @@
 ---
-{'layout': 'default', 
- 'title': 'FAQ',
- 'tagline': 'Frequently Asked Questions'}
-
+layout: default
+title: FAQ
+tagline: Frequently Asked Questions
+permalink: faq/
 ---
 Are you interested in joining TimVideos.us as either a GSoC student or mentor?  Here are answers to some questions you may have. 
 

diff --git a/Gemfile b/Gemfile
@@ -1,4 +1,3 @@
 gem 'jekyll',   '~> 2.0.3'
 gem 'kramdown', '~> 1.3.3'
-gem 'planet',   '~> 0.5.3'
-gem 'method_info', '~> 0.1.11'
+gem 'planet',   '~> 0.5.3'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -47,7 +47,6 @@ GEM
     loofah (2.0.0)
       nokogiri (>= 1.5.9)
     mercenary (0.3.3)
-    method_info (0.1.11)
     mini_portile (0.5.3)
     mustache (0.99.5)
     nokogiri (1.6.2.rc2)
@@ -85,5 +84,4 @@ PLATFORMS
 DEPENDENCIES
   jekyll (~> 2.0.3)
   kramdown (~> 1.3.3)
-  method_info (~> 0.1.11)
   planet (~> 0.5.3)
diff --git a/HDMI2USB.md b/HDMI2USB.md
@@ -1,8 +1,8 @@
 ---
-{'layout': 'default', 
- 'title': 'HDMI2USB',
- 'tagline': ''}
-
+layout: default
+title: HDMI2USB
+tagline: ''
+permalink: projects/hdmi2usb/
 ---
 
 # HDMI2USB

diff --git a/Home.md b/Home.md
@@ -1,8 +1,8 @@
 ---
-{'layout': 'default', 
- 'title': 'Getting Started!',
- 'tagline': 'How to start contributing to TimVideos.us'}
-
+layout: default
+title: Getting Started!
+tagline: How to start contributing to TimVideos.us
+permalink: home/
 ---
 
 # Welcome!
@@ -17,9 +17,9 @@ Whether you want to work hands-on with hardware or code in a variety of language
 
 ## Getting Started
 
-Google Summer of Code (or similar project-based program) students should first head over to the [[Summer Of Code]] page and then head to our [[Ideas]] page.
+Google Summer of Code (or similar project-based program) students should first head over to the [Summer Of Code]({% page_url summer-of-code %}) page and then head to our [Ideas]({% page_url ideas %}) page.
 
-If you are just interested in contributing and this is your first visit, head over to the [[Ideas]] page.
+If you are just interested in contributing and this is your first visit, head over to the [Ideas]({% page_url ideas %}) page.
 
 If you have a Digilent Atlys Board, head over to the [HDMI2USB Wiki](https://github.com/timvideos/HDMI2USB/wiki) and specifically look at the [Digilent Atlys Board: Getting Started](https://github.com/timvideos/HDMI2USB/wiki/Digilent-Atlys-Board%3A-Getting-Started) page.
 
@@ -30,9 +30,9 @@ If you have a Digilent Atlys Board, head over to the [HDMI2USB Wiki](https://git
 | Name &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; | <small>(C)ode<br>(M)ailing&nbsp;List<br>(I)RC</small>| Description |
 | -------- | ---------------------------------------------------- | ------------ |
 | <img src="http://code.timvideos.us/favicon.ico" class="favicon"> **TimVideos.us** | [(C)](http://github.com/timvideos) [(M)](https://groups.google.com/group/timvideos) [(I)](irc://irc.freenode.org/#timvideos) | Parent project. |
-| [[HDMI2USB]]         | [(C)](http://github.com/timvideos/HDMI2USB) [(M)](https://groups.google.com/group/hdmi2usb?hl=en-GB) [(I)](irc://irc.freenode.org/#hdmi2usb) | HDMI2USB is hardware for capturing HDMI, DVI and DisplayPort data. By capturing in high quality what is being presented locally it facilitates sharing with remote users and creates great recording for later viewing. The HDMI2USB hardware can also capture the HDMI output from cameras. |
-| [[gst-switch]]       | [(C)](http://github.com/timvideos/gst-switch)&nbsp;[(M)](https://groups.google.com/group/gst-switch)&nbsp;[(I)](irc://irc.freenode.org/#gst-switch)  | [[gst-switch]] aims to do interactive live mixing of incoming video streams, designed to meet the needs of conference recording. Designed as a flexible replacement for DVSwitch, and based around GStreamer.  |
-| [speakertrack](/gst-switch.html#speakertrack)   | [(C)](http://github.com/timvideos/gst-switch) | Speakertrack is an extension to GStreamer and gst-switch to allow automatic tracking of speakers using remotely-operated PTZ cameras rather then relying on a camera operator. |
+| [HDMI2USB]({% page_url hdmi2usb %})         | [(C)](http://github.com/timvideos/HDMI2USB) [(M)](https://groups.google.com/group/hdmi2usb?hl=en-GB) [(I)](irc://irc.freenode.org/#hdmi2usb) | HDMI2USB is hardware for capturing HDMI, DVI and DisplayPort data. By capturing in high quality what is being presented locally it facilitates sharing with remote users and creates great recording for later viewing. The HDMI2USB hardware can also capture the HDMI output from cameras. |
+| [gst-switch]({% page_url gst-switch %})       | [(C)](http://github.com/timvideos/gst-switch)&nbsp;[(M)](https://groups.google.com/group/gst-switch)&nbsp;[(I)](irc://irc.freenode.org/#gst-switch)  | [gst-switch]({% page_url gst-switch %}) aims to do interactive live mixing of incoming video streams, designed to meet the needs of conference recording. Designed as a flexible replacement for DVSwitch, and based around GStreamer.  |
+| [speakertrack]({% page_url gst-switch %}#speakertrack)   | [(C)](http://github.com/timvideos/gst-switch) | Speakertrack is an extension to GStreamer and gst-switch to allow automatic tracking of speakers using remotely-operated PTZ cameras rather then relying on a camera operator. |
 | [Streaming System](https://github.com/timvideos/streaming-system) | [(C)](http://github.com/timvideos/streaming-system) [(M)](https://groups.google.com/group/timvideos) [(I)](irc://irc.freenode.org/#timvideos) | Streaming-system is a comprehensive video conferencing package that allows users to set up and deploy a live streaming system. It includes a website, setup scripts and watchdog code. |
 
 ### Partner Projects

diff --git a/Ideas.md b/Ideas.md
@@ -1,15 +1,16 @@
 ---
-{'layout': 'default',
- 'title': 'Ideas!',
- 'tagline': 'Projects you could possibly work on.'}
+layout: default
+title: Ideas!
+tagline: Projects you could possibly work on.
+permalink: ideas/
 
 ---
 
 # Overview
 
 TimVideos.us is a group of exciting projects which together create a system for doing both recording and live event streaming for conferences, meetings, user groups and other presentations.  Whether you want to work hands-on with hardware or code in a variety of languages, we have a project for you. Join the team!
 
-Check out the [Getting Started!](/Home.html) page.  Students should also read the [[Summer Of Code]] page.
+Check out the [Getting Started!]({% page_url home %}) page.  Students should also read the [Summer Of Code]({% page_url summer-of-code %}) page.
 
 The following information and flow diagram should help you explore current TimVideos projects and learn how to start contributing. 
 
@@ -50,7 +51,7 @@ The following information and flow diagram should help you explore current TimVi
 # Ideas List
 
  * This ideas list is dynamically generated from the [Ideas tracker](https://github.com/timvideos/getting-started/issues?state=open).  You can view, filter, and comment on ideas there.  
- * Feel free to suggest your own ideas!  New ideas should be added using the [Markdown Ideas Template](/Ideas.html#markdown-ideas-template).  
+ * Feel free to suggest your own ideas!  New ideas should be added using the [Markdown Ideas Template]({% page_url ideas %}#markdown-ideas-template).  
  * There are many bugs within individual components which are not yet listed as potential starter projects. Check out the bug trackers!
 
 <hr class="project-line">
@@ -140,7 +141,7 @@ HDMI2USB is a core hardware project in the Tim Videos suite. There are two types
 
 
 <p style='font-size: 18px; color: red; text-align: center;'>
-<strong>!!! All hardware projects will require you to have a <a href="/HDMI2USB.html#digilent-atlys-prototype-board">Digilent ATLYS prototype board</a> !!!</strong>
+<strong>!!! All hardware projects will require you to have a [Digilent ATLYS prototype board]({% page_url summer-of-code %}digilent-atlys-prototype-board) !!!</strong>
 </p>
 
 If you can show that you are committed to developing hardware (such as being accepted into a program like Google Summer of Code), **you can apply for a grant to have a board provided to you for development.**

diff --git a/News.html b/News.html
@@ -1,8 +1,8 @@
 ---
-{'layout': 'default', 
- 'title': 'Developers news',
- 'tagline': 'News from Tim Videos community!'}
-
+layout: default
+title: Developers news
+tagline: News from Tim Videos community!
+permalink: news/
 ---
 <h1>News from Tim Videos community</h1>
 

diff --git a/People.md b/People.md
@@ -1,7 +1,8 @@
 ---
-{'layout': 'default',
- 'title': 'People',
- 'tagline': 'The creators of Tim Videos (it is not just Tim!).'}
+layout: default
+title: People
+tagline: The creators of Tim Videos (it is not just Tim!).
+permalink: people/
 
 ---
 

diff --git a/Summer-Of-Code.md b/Summer-Of-Code.md
@@ -1,7 +1,8 @@
 ---
-{'layout': 'default',
- 'title': 'Summer Of Code',
- 'tagline': 'Information for Google Summer of Code participants.'}
+layout: default
+title: Summer Of Code
+tagline': Information for Google Summer of Code participants.
+permalink: summer-of-code/
 
 ---
 
@@ -231,7 +232,7 @@ The following are conditions that result in automatic rejection:
 
 # Ideas
 
-You can find our ideas list on the [[Ideas]] page. The list is not definitive and any student is more than **welcome to come up with their own idea** to work on. **Initiative is a skill which will rate highly** when selecting projects. Feel free to come up with your own projects.
+You can find our ideas list on the [Ideas]({% page_url ideas %}) page. The list is not definitive and any student is more than **welcome to come up with their own idea** to work on. **Initiative is a skill which will rate highly** when selecting projects. Feel free to come up with your own projects.
 
 # Mentors
 

diff --git a/_config.yml b/_config.yml
@@ -1,7 +1,9 @@
 markdown: kramdown
 kramdown:
   entity_output: as_input
-exclude: ['Gemfile', 'Gemfile.lock', 'planet.yml']
-name: "Tim Videos - Live Event Streaming - Developers page"
-description: "News, informations, instructions and how to contribute"
-url: http://code.timvideos.us
+exclude: [Gemfile, Gemfile.lock, planet.yml]
+name: Tim Videos - Live Event Streaming - Developers page
+description: News, informations, instructions and how to contribute
+url: http://code.timvideos.us
+permalink: pretty
+highlighter: pygments
diff --git a/_layouts/default.html b/_layouts/default.html
@@ -6,9 +6,9 @@
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <title>Tim Videos - Live Event Streaming - {{page.title}}</title>
 
-    <link rel="stylesheet" href="css/styles.css">
-    <link rel="stylesheet" href="css/pygment_trac.css">
-    <script src="js/scale.fix.js"></script>
+    <link rel="stylesheet" href="{{ "/css/styles.css" | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="{{ "/css/pygment_trac.css" | prepend: site.baseurl }}">
+    <script src="{{ "js/scale.fix.js" | prepend: site.baseurl }}"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <!--[if lt IE 9]>
     <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -26,15 +26,14 @@ <h1 class="header">{{page.title}}</h1>
           <li class="download"><a class="buttons" href="https://github.com/timvideos/getting-started/zipball/master">Download ZIP</a></li>
           <li class="download"><a class="buttons" href="https://github.com/timvideos/getting-started/tarball/master">Download TAR</a></li>
   -->
-          <li><a class="buttons" href="Home.html">Getting Started</a></li>
-          <li><a class="buttons" href="News.html">News</a></li>
-          <li><a class="buttons" href="Ideas.html">Ideas</a> (<a href="https://github.com/timvideos/getting-started/issues">Tracker</a>)</li>
-          <li><a class="buttons" href="People.html">People</a></li>
+          <li><a class="buttons" href="{{ "/home" | prepend: site.baseurl }}">Getting Started</a></li>
+          <li><a class="buttons" href="{{ "/news" | prepend: site.baseurl }}">News</a></li>
+          <li><a class="buttons" href="{{ "/ideas" | prepend: site.baseurl }}">Ideas</a> (<a href="https://github.com/timvideos/getting-started/issues">Tracker</a>)</li>
+          <li><a class="buttons" href="{{ "/people" | prepend: site.baseurl }}">People</a></li>
 
         </ul>
 
-        <p class="header"><a class="header name" href="https://github.com/timvideos/getting-started/wiki{{page.url|replace_first:'.html',''}}/_edit">Edit</a></p> 
-
+        <p class="header"><a class="header name" href="https://github.com/timvideos/getting-started/wiki{{page.url| capitalize }}_edit">Edit</a></p>
       </header>
       <section>
 {{content}}

diff --git a/_layouts/post.html b/_layouts/post.html
@@ -6,9 +6,9 @@
     <meta http-equiv="X-UA-Compatible" content="chrome=1">
     <title>Tim Videos - Live Event Streaming - {{page.title}}</title>
 
-    <link rel="stylesheet" href="../../../css/styles.css">
-    <link rel="stylesheet" href="../../../css/pygment_trac.css">
-    <script src="../../../js/scale.fix.js"></script>
+    <link rel="stylesheet" href="{{ "/css/styles.css" | prepend: site.baseurl }}">
+    <link rel="stylesheet" href="{{ "/css/pygment_trac.css" | prepend: site.baseurl }}">
+    <script src="{{ "js/scale.fix.js" | prepend: site.baseurl }}"></script>
     <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
     <!--[if lt IE 9]>
     <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
@@ -26,15 +26,14 @@ <h1 class="header">Developers news</h1>
           <li class="download"><a class="buttons" href="https://github.com/timvideos/getting-started/zipball/master">Download ZIP</a></li>
           <li class="download"><a class="buttons" href="https://github.com/timvideos/getting-started/tarball/master">Download TAR</a></li>
   -->
-          <li><a class="buttons" href="../../../Home.html">Getting Started</a></li>
-          <li><a class="buttons" href="../../../News.html">News</a></li>
-          <li><a class="buttons" href="../../../Ideas.html">Ideas</a> (<a href="https://github.com/timvideos/getting-started/issues">Tracker</a>)</li>
-          <li><a class="buttons" href="../../../People.html">People</a></li>
+          <li><a class="buttons" href="{{ "/home" | prepend: site.baseurl }}">Getting Started</a></li>
+          <li><a class="buttons" href="{{ "/news" | prepend: site.baseurl }}">News</a></li>
+          <li><a class="buttons" href="{{ "/ideas" | prepend: site.baseurl }}">Ideas</a> (<a href="https://github.com/timvideos/getting-started/issues">Tracker</a>)</li>
+          <li><a class="buttons" href="{{ "/people" | prepend: site.baseurl }}">People</a></li>
 
         </ul>
 
-        <p class="header"><a class="header name" href="https://github.com/timvideos/getting-started/wiki{{page.url|replace_first:'.html',''}}/_edit">Edit</a></p> 
-
+        <p class="header"><a class="header name" href="https://github.com/timvideos/getting-started/wiki{{page.url| capitalize }}_edit">Edit</a></p>
       </header>
       <section>
       <h1>{{page.title}}</h1>

diff --git a/_references.md b/_references.md
@@ -4,7 +4,7 @@
  [DVSwitch]: http://dvswitch.alioth.debian.org/wiki/
  [GStreamer]: http://gstreamer.freedesktop.org/
  [DV]: https://en.wikipedia.org/wiki/DV
- [st]: gst-switch.html#speakertrack
+ [st]: gst-switch/#speakertrack
 
 <!-- gst-switch (speaker track) -->
 

diff --git a/gst-switch.md b/gst-switch.md
@@ -1,8 +1,8 @@
 ---
-{'layout': 'default', 
- 'title': 'gst-switch',
- 'tagline': 'A modern Gstreamer based software video mixer'}
-
+layout: default
+title: gst-switch
+tagline': A modern Gstreamer based software video mixer
+permalink: projects/gst-switch/
 ---
 
 # gst-switch

diff --git a/index.html b/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
-<meta http-equiv="REFRESH" content="0;url=Home.html"></head>
+<meta http-equiv="REFRESH" content="0;url=home/"></head>
 </html>