port to jekyll

qwebirc · Jun 2, 2018 · c0ed3a7 · c0ed3a7
1 parent c090f3b
commit c0ed3a7
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 72 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1 @@
-*.pyc
-static
-web
-webpy
-log
+_site
diff --git a/_config.yml b/_config.yml
@@ -0,0 +1 @@
+url: "https://qwebirc.org"
diff --git a/templates/base.html → _layouts/default.html b/templates/base.html → _layouts/default.html
@@ -1,18 +1,16 @@
-$def with (page_title, title, content)
-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-  <title>$page_title - the qwebirc project</title>
+  <title>{{ page.title }} - the qwebirc project</title>
   <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
-  <link rel="icon" type="image/png" href="/static/images/favicon.png"/>
-  <link rel="stylesheet" href="/static/css/screen.css" type="text/css" media="screen"/>
+  <link rel="icon" type="image/png" href="images/favicon.png"/>
+  <link rel="stylesheet" href="css/screen.css" type="text/css" media="screen"/>
 </head>
 <body>
   <div id="header">
     <div class="image" style="height: 134px; overflow: hidden;">
-      <a href="/"><img src="/static/images/qwebircsmall.png" alt="qwebirc" title="qwebirc" height="134" width="134"/></a>
+      <a href="./"><img src="images/qwebircsmall.png" alt="qwebirc" title="qwebirc" height="134" width="134"/></a>
     </div>
     <div class="right">
       <div class="text">
@@ -23,7 +21,7 @@ <h1>qwebirc</h1>
       </div>
       <div id="menu">
         <span>
-          <a href="/news">News</a> |
+          <a href="./">News</a> |
           <a href="about">About</a> |
           <a href="features">Features</a> |
           <a href="license">License</a> |
@@ -40,9 +38,9 @@ <h1>qwebirc</h1>
   </div>
   <div id="blocker"></div>
   <div id="content">
-    <h2>$title</h2>
+    <h2>{{ page.title }}</h2>
     <div id="text">
-$:content
+{{ content }}
     </div>
   </div>
 </body>

diff --git a/templates/about.html → about.html b/templates/about.html → about.html
@@ -1,3 +1,7 @@
+---
+layout: default
+title: About
+---
 Copyright &copy; 2008-2017 Chris Porter and the qwebirc project.<br/>All rights reserved.<br/><br/>
 
 This software contains portions by the following third parties:

diff --git a/static.template/css/screen.css → css/screen.css b/static.template/css/screen.css → css/screen.css
@@ -114,7 +114,7 @@ div#content h4 {
 }
 
 div#text-image {
-  background-image: url(/images/qwebirc-text.png);
+  background-image: url(images/qwebirc-text.png);
   margin-top: 33px;
   height: 59px;
   background-repeat: no-repeat;

diff --git a/templates/download.html → download.html b/templates/download.html → download.html
@@ -1,3 +1,7 @@
+---
+layout: default
+title: Default
+---
 <span class="warning"><a href="installation">Remember to read the installation instructions!</a></span>
 
 <h2>Users of qwebirc</h2>
@@ -18,7 +22,7 @@ <h2>File downloads</h2>
 
 <h4>Latest version</h4>
 <ul>
-<li><a href="download-master-zip">Download in zip format.</a></li>
+<li><a href="https://github.com/qwebirc/qwebirc/archive/master.zip">Download in zip format.</a></li>
 </ul>
 
 <h2>Your changes!</h2>

diff --git a/templates/faq.html → faq.html b/templates/faq.html → faq.html
@@ -1,3 +1,7 @@
+---
+layout: default
+title: Frequently asked questions
+---
 <a name="general" />
 <h3>General questions</h3>
 

diff --git a/static.template/favicon.ico → favicon.ico b/static.template/favicon.ico → favicon.ico
diff --git a/templates/features.html → features.html b/templates/features.html → features.html
@@ -1,3 +1,8 @@
+---
+layout: default
+title: Features
+display_title: qwebirc's features
+---
 <ul>
 <li>qwebirc is an AJAX IRC client.</li>
 <li>Open source (GPLv2).</li>

diff --git a/static.template/images/favicon.png → images/favicon.png b/static.template/images/favicon.png → images/favicon.png
diff --git a/static.template/images/qwebirc-text.png → images/qwebirc-text.png b/static.template/images/qwebirc-text.png → images/qwebirc-text.png
diff --git a/static.template/images/qwebircsmall.png → images/qwebircsmall.png b/static.template/images/qwebircsmall.png → images/qwebircsmall.png
diff --git a/templates/news.html → index.html b/templates/news.html → index.html
@@ -1,3 +1,8 @@
+---
+layout: default
+title: News
+display_title: Welcome!
+---
 qwebirc is a fast, easy to use, free and open source IRC client designed by and originally just for the <a href="http://www.quakenet.org/">QuakeNet IRC network</a>.
 
 <h3>News</h3>

diff --git a/templates/installation.html → installation.html b/templates/installation.html → installation.html
@@ -1,3 +1,7 @@
+---
+layout: default
+title: Installation
+---
 <ul>
   <li>First install the dependencies for your operating system:
     <ul>

diff --git a/templates/irc.html → irc.html b/templates/irc.html → irc.html
@@ -1,3 +1,7 @@
+---
+layout: default
+title: IRC channel
+---
 Please note this is NOT a general chat channel, it is for 
 discussion/questions/support relating to qwebirc.<br/><br/>
 

diff --git a/templates/license.html → license.html b/templates/license.html → license.html
@@ -1,3 +1,7 @@
+---
+layout: default
+title: Licence
+---
 Copyright (c) 2008-2017 Chris Porter and the qwebirc project.<br/>
 <a href="http://www.qwebirc.org/">http://www.qwebirc.org/</a>
 

diff --git a/qwebirc.py b/qwebirc.py
-Original file line number
+Diff line change
@@ -1,5 +1 @@
-    *.pyc
-    static
-    web
-    webpy
-    log
+    _site