diff --git a/.gitignore b/.gitignore
index a320f7b..9ac10c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@
# Ignore .DS_store file
.DS_Store
+
+*scratchpad*
diff --git a/Gemfile.lock b/Gemfile.lock
index 59f13ea..ec8ebb9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -106,8 +106,6 @@ DEPENDENCIES
middleman (~> 4.1)
middleman-blog
redcarpet (~> 3.3, >= 3.3.3)
- tzinfo-data
- wdm (~> 0.1.0)
BUNDLED WITH
1.17.2
diff --git a/config.rb b/config.rb
index c751439..8d306f8 100644
--- a/config.rb
+++ b/config.rb
@@ -34,7 +34,7 @@ activate :blog do |blog|
# blog.year_link = "{year}.html"
# blog.month_link = "{year}/{month}.html"
# blog.day_link = "{year}/{month}/{day}.html"
- # blog.default_extension = ".markdown"
+ blog.default_extension = ".html.markdown"
blog.tag_template = "tag.html"
blog.calendar_template = "calendar.html"
@@ -47,9 +47,9 @@ end
page "/feed.xml", layout: false
# Reload the browser automatically whenever files change
-configure :development do
- activate :livereload
-end
+# configure :development do
+# activate :livereload
+# end
# Methods defined in the helpers block are available in templates
helpers do
diff --git a/source/2012-01-01-example-article.html.markdown b/source/2012-01-01-example-article.html.markdown
deleted file mode 100644
index 618d7f3..0000000
--- a/source/2012-01-01-example-article.html.markdown
+++ /dev/null
@@ -1,7 +0,0 @@
----
-title: Example Article
-date: 2012-01-01
-tags: example
----
-
-This is an example article. You probably want to delete it and write your own articles!
diff --git a/source/2019-06-10-contemplating-full-ownership-software.html.markdown b/source/2019-06-10-contemplating-full-ownership-software.html.markdown
new file mode 100644
index 0000000..d869bfd
--- /dev/null
+++ b/source/2019-06-10-contemplating-full-ownership-software.html.markdown
@@ -0,0 +1,6 @@
+---
+title: Contemplating "Full Ownership Software"
+date: 2019-06-10
+---
+
+Doop dee doo.
diff --git a/source/favicon.ico b/source/favicon.ico
new file mode 100644
index 0000000..bf47310
Binary files /dev/null and b/source/favicon.ico differ
diff --git a/source/foo.bar.txt b/source/foo.bar.txt
new file mode 100644
index 0000000..1385f26
--- /dev/null
+++ b/source/foo.bar.txt
@@ -0,0 +1 @@
+hey
diff --git a/source/header_logo.png b/source/header_logo.png
new file mode 100644
index 0000000..da58307
Binary files /dev/null and b/source/header_logo.png differ
diff --git a/source/index.html.erb b/source/index.html.erb
index 0fae27e..cde485e 100644
--- a/source/index.html.erb
+++ b/source/index.html.erb
@@ -2,23 +2,24 @@
pageable: true
per_page: 10
---
-<% if paginate && num_pages > 1 %>
- Page <%= page_number %> of <%= num_pages %>
- <% if prev_page %>
- <%= link_to 'Previous page', prev_page %>
- <% end %>
-<% end %>
+
+
+
-<% page_articles.each_with_index do |article, i| %>
- <%= link_to article.title, article %> <%= article.date.strftime('%b %e') %>
-
- <%= article.body %>
-<% end %>
+ <%= partial "layout/headerr" %>
-<% if paginate %>
- <% if next_page %>
- <%= link_to 'Next page', next_page %>
- <% end %>
-<% end %>
+
+
+
+
+ <%= partial "layout/navbar" %>
+
+
+ <%= partial "layout/leftcol" %>
+ <%= partial "layout/rightcol" %>
+
+
+ <%= partial "layout/_footer" %>
+
+
diff --git a/source/layout.erb b/source/layout.erb
index 61caa6a..75323af 100644
--- a/source/layout.erb
+++ b/source/layout.erb
@@ -3,38 +3,13 @@
-
+
- Blog Title<%= ' - ' + current_article.title unless current_article.nil? %>
+ The Navigator's Blog<%= ' - ' + current_article.title unless current_article.nil? %>
+
<%= feed_tag :atom, "#{blog.options.prefix.to_s}/feed.xml", title: "Atom Feed" %>
-
-
-
+
<%= yield %>
-
-
-
diff --git a/source/layout/_footer.html.erb b/source/layout/_footer.html.erb
new file mode 100644
index 0000000..f2ebf40
--- /dev/null
+++ b/source/layout/_footer.html.erb
@@ -0,0 +1,19 @@
+
+ |
+ Last updated <%= Time.now %>
+ <% if paginate && num_pages > 1 %>
+ Page <%= page_number %> of <%= num_pages %>
+ <% if prev_page %>
+ <%= link_to 'Previous page', prev_page %>
+ <% end %>
+ <% end %>
+
+ <% if paginate %>
+ <% if next_page %>
+ <%= link_to 'Next page', next_page %>
+ <% end %>
+ <% end %>
+
+ Copyleft ©2002
+ |
+
diff --git a/source/layout/_headerr.html.erb b/source/layout/_headerr.html.erb
new file mode 100644
index 0000000..acff147
--- /dev/null
+++ b/source/layout/_headerr.html.erb
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+ |
+
+
diff --git a/source/layout/_leftcol.html.erb b/source/layout/_leftcol.html.erb
new file mode 100644
index 0000000..6f59b09
--- /dev/null
+++ b/source/layout/_leftcol.html.erb
@@ -0,0 +1,20 @@
+
+
+ Around ~Town
+ Friday Postcard
+ TildeTel
+ TildeNews
+ TildeChat
+ Desolation Search
+
+
+ Recent Articles
+
+ <% blog.articles[0...10].each do |article| %>
+ - <%= link_to article.title, article %> <%= article.date.strftime('%b %e') %>
+ <% end %>
+
+
+
+
+ |
diff --git a/source/layout/_navbar.html.erb b/source/layout/_navbar.html.erb
new file mode 100644
index 0000000..7ff7703
--- /dev/null
+++ b/source/layout/_navbar.html.erb
@@ -0,0 +1,3 @@
+
+ | Home |
+
diff --git a/source/layout/_rightcol.html.erb b/source/layout/_rightcol.html.erb
new file mode 100644
index 0000000..03a830c
--- /dev/null
+++ b/source/layout/_rightcol.html.erb
@@ -0,0 +1,12 @@
+
+ <% page_articles.each_with_index do |article, i| %>
+
+ <%= link_to article.title, article %>
+
+ <%= article.date.strftime('%b %e') %>
+
+
+
+ <%= article.body %>
+ <% end %>
+ |
diff --git a/source/tag.html.erb b/source/tag.html.erb
deleted file mode 100644
index c28a20b..0000000
--- a/source/tag.html.erb
+++ /dev/null
@@ -1,25 +0,0 @@
----
-pageable: true
-per_page: 12
----
-Articles tagged '<%= tagname %>'
-
-<% if paginate && num_pages > 1 %>
- Page <%= page_number %> of <%= num_pages %>
-
- <% if prev_page %>
- <%= link_to 'Previous page', prev_page %>
- <% end %>
-<% end %>
-
-
- <% page_articles.each_with_index do |article, i| %>
- - <%= link_to article.title, article %> <%= article.date.strftime('%b %e') %>
- <% end %>
-
-
-<% if paginate %>
- <% if next_page %>
- <%= link_to 'Next page', next_page %>
- <% end %>
-<% end %>