From 427429932f816ca77a36ca4bec46104b27a3b897 Mon Sep 17 00:00:00 2001 From: Chris Ritzo Date: Tue, 25 Mar 2014 09:07:23 -0400 Subject: [PATCH 1/6] added css and formatting for downloads table scaling, added placeholder table for 1.1 release images. --- .../css/commotion-responsive-480.css | 4 + .../download/routers/index.md | 134 ++++++++++++++++-- 2 files changed, 130 insertions(+), 8 deletions(-) diff --git a/commotionwireless.net/css/commotion-responsive-480.css b/commotionwireless.net/css/commotion-responsive-480.css index d828fab5..f4d28e06 100644 --- a/commotionwireless.net/css/commotion-responsive-480.css +++ b/commotionwireless.net/css/commotion-responsive-480.css @@ -434,6 +434,10 @@ div#download-button-block .download-button a.button { margin-left: 10px; padding: 5px 21px 5px 0; } +.downloads-table { + overflow: auto; + width: 100%; +} .verifying-downloads-block { float:right; diff --git a/commotionwireless.net/download/routers/index.md b/commotionwireless.net/download/routers/index.md index 4a6922f0..f7676f8d 100644 --- a/commotionwireless.net/download/routers/index.md +++ b/commotionwireless.net/download/routers/index.md @@ -42,15 +42,133 @@ lang: en

Commotion Router Downloads

+

Version 1.1

+

Commotion version 1.1 was released in March 2014. Official software images are posted here.

+ +

If you are interested in trying the newest features of Commotion Router, check out our nightly builds and contact us for support questions.

+ +

Manufacturer: Ubiquiti

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
RouterMD5DateSize
+

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Factory Install | (sig)

+ 		MD5DATESIZE MB
+

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Upgrade | (sig)

+ 		MD5DATESIZE MB
+

Ubiquiti Nanostation M2/M5 -- Factory Install | (sig)

+ 		MD5DATE MB
+

Ubiquiti Nanostation M2/M5 -- Upgrade | (sig)

+ 		MD5DATE MB
+

Ubiquiti Rocket M2/M5 -- Factory Install | (sig)

+ 		MD5DATE MB
+

Ubiquiti Rocket M2/M5 -- Upgrade | (sig)

+ 		MD5DATE MB
+

Ubiquiti Unifi Outdoor -- Factory Install | (sig)

+ 		MD5DATE MB
+

Ubiquiti Unifi Outdoor -- Upgrade | (sig)

+ 		MD5DATE MB
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
RouterMD5DateSize
TL-WDR4300MD5DATESIZE MB
TL-WDR3600MD5DATESIZE MB
TL-WDR4310MD5DATESIZE MB
+
+ +

Version 1.0

Commotion version 1.0 was released in December 2013. Official software images are posted here.

-

If you are interested in trying the newest features of Commotion Router, check out our nightly builds and contact us for support questions.
- 

+

If you are interested in trying the newest features of Commotion Router, check out our nightly builds and contact us for support questions.

- -#### Manufacturer: Ubiquiti +

Manufacturer: Ubiquiti

+
@@ -127,11 +245,10 @@ lang: en
+
- - -#### Manufacturer: TP Link - + +
@@ -143,6 +260,7 @@ lang: en
+

Nightly Builds

Our nightly builds are back! Nightly built images of Commotion OpenWRT are generated from our build server and posted to downloads.commotionwireless.net/nightly. Nightly images contain the most up to date feature and bug fix commites, but should be considered working, yet unstable builds.

From 2507bbf540b38269da6af72aabfc1cdee74548a8 Mon Sep 17 00:00:00 2001 From: Chris Ritzo Date: Fri, 4 Apr 2014 22:01:17 -0400 Subject: [PATCH 2/6] updated commotion router download page with 1.1 image links, md5 sums. --- .../download/routers/index.md | 68 +++++++++---------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/commotionwireless.net/download/routers/index.md b/commotionwireless.net/download/routers/index.md index f7676f8d..539353fc 100644 --- a/commotionwireless.net/download/routers/index.md +++ b/commotionwireless.net/download/routers/index.md @@ -30,11 +30,7 @@ lang: en

Don't see your device listed? Check the Commotion Router Developer Hardware in testing wiki page for a full list of devices being tested with Commotion OpenWRT.

-

Current Release = v1.0 "Grumpy Cat"

- -

At this time, the Commotion team recommends using factory install images for v1.0 to take full advantage of all new features in the 1.0 release.

- -

 

+

Current Release: v1.1 "Grumpy Cat"

 

@@ -43,7 +39,7 @@ lang: en

Commotion Router Downloads

Version 1.1

-

Commotion version 1.1 was released in March 2014. Official software images are posted here.

+

Commotion version 1.1 was released in April 2014. Official software images are posted here.

If you are interested in trying the newest features of Commotion Router, check out our nightly builds and contact us for support questions.

@@ -63,65 +59,65 @@ lang: en

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Factory Install | (sig)

- MD5 - DATE - SIZE MB + d47acc9644506a3993a1fef1a1c9d0b3 + 4-14-14 + 5.3 MB

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Upgrade | (sig)

- MD5 - DATE - SIZE MB + c14f72c2378d4d8e08f9470d64d57c29 + 4-14-14 + 5.3 MB

Ubiquiti Nanostation M2/M5 -- Factory Install | (sig)

- MD5 - DATE - MB + e6116446eb8d6910f69855c401e9bb5b + 4-14-14 + 5.3 MB

Ubiquiti Nanostation M2/M5 -- Upgrade | (sig)

- MD5 - DATE - MB + 4d01fce056945b55f7749dd7b473a5bc + 4-14-14 + 5.3 MB

Ubiquiti Rocket M2/M5 -- Factory Install | (sig)

- MD5 - DATE - MB + 9444ce2084ba51688d52fe896e77895a + 4-14-14 + 5.3 MB

Ubiquiti Rocket M2/M5 -- Upgrade | (sig)

- MD5 - DATE - MB + a81dafa5a73b75d12b0bd006e60b239c + 4-14-14 + 5.3 MB

Ubiquiti Unifi Outdoor -- Factory Install | (sig)

- MD5 - DATE - MB + 411a32be53561a5905b32f85627d2628 + 4-14-14 + 5.3 MB

Ubiquiti Unifi Outdoor -- Upgrade | (sig)

- MD5 - DATE - MB + c69c5c95d4d43f83f62dd89f0df44843 + 4-14-14 + 5.3 MB @@ -141,20 +137,20 @@ lang: en TL-WDR4300 MD5 - DATE - SIZE MB + 4-14-14 + 5.3 MB TL-WDR3600 MD5 - DATE - SIZE MB + 4-14-14 + 5.3 MB TL-WDR4310 MD5 - DATE - SIZE MB + 4-14-14 + 5.3 MB From 514f2cf3d78c679f5bd44552669d95dc19c5ca00 Mon Sep 17 00:00:00 2001 From: Chris Ritzo Date: Fri, 4 Apr 2014 22:12:34 -0400 Subject: [PATCH 3/6] additional updates to commotion router download page --- .../download/routers/index.md | 121 ++---------------- 1 file changed, 13 insertions(+), 108 deletions(-) diff --git a/commotionwireless.net/download/routers/index.md b/commotionwireless.net/download/routers/index.md index 539353fc..7b85e953 100644 --- a/commotionwireless.net/download/routers/index.md +++ b/commotionwireless.net/download/routers/index.md @@ -57,7 +57,7 @@ lang: en -

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Factory Install | (sig)

+

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Factory Install | (sig)

d47acc9644506a3993a1fef1a1c9d0b3 4-14-14 @@ -65,7 +65,7 @@ lang: en -

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Upgrade | (sig)

+

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Upgrade | (sig)

c14f72c2378d4d8e08f9470d64d57c29 4-14-14 @@ -73,7 +73,7 @@ lang: en -

Ubiquiti Nanostation M2/M5 -- Factory Install | (sig)

+

Ubiquiti Nanostation M2/M5 -- Factory Install | (sig)

e6116446eb8d6910f69855c401e9bb5b 4-14-14 @@ -81,7 +81,7 @@ lang: en -

Ubiquiti Nanostation M2/M5 -- Upgrade | (sig)

+

Ubiquiti Nanostation M2/M5 -- Upgrade | (sig)

4d01fce056945b55f7749dd7b473a5bc 4-14-14 @@ -89,7 +89,7 @@ lang: en -

Ubiquiti Rocket M2/M5 -- Factory Install | (sig)

+

Ubiquiti Rocket M2/M5 -- Factory Install | (sig)

9444ce2084ba51688d52fe896e77895a 4-14-14 @@ -97,7 +97,7 @@ lang: en -

Ubiquiti Rocket M2/M5 -- Upgrade | (sig)

+

Ubiquiti Rocket M2/M5 -- Upgrade | (sig)

a81dafa5a73b75d12b0bd006e60b239c 4-14-14 @@ -105,7 +105,7 @@ lang: en -

Ubiquiti Unifi Outdoor -- Factory Install | (sig)

+

Ubiquiti Unifi Outdoor -- Factory Install | (sig)

411a32be53561a5905b32f85627d2628 4-14-14 @@ -113,7 +113,7 @@ lang: en -

Ubiquiti Unifi Outdoor -- Upgrade | (sig)

+

Ubiquiti Unifi Outdoor -- Upgrade | (sig)

c69c5c95d4d43f83f62dd89f0df44843 4-14-14 @@ -157,106 +157,11 @@ lang: en -

Version 1.0

- -

Commotion version 1.0 was released in December 2013. Official software images are posted here.

- -

If you are interested in trying the newest features of Commotion Router, check out our nightly builds and contact us for support questions.

- -

Manufacturer: Ubiquiti

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
RouterMD5DateSize
-

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Factory Install | (sig)

- 		c8e3b011602b23c646c8c66532b10e3412/30/20135.2 MB
-

Ubiquiti Picostation M2 and Ubiquiti Bullet M2/M5 -- Upgrade | (sig)

- 		1f0ffa7d8300db4c1788c913cece43b512/30/20135.2 MB
-

Ubiquiti Nanostation M2/M5 -- Factory Install | (sig)

- 		7c5ded26f3701026f5a4d586754f6e7612/30/20135.2 MB
-

Ubiquiti Nanostation M2/M5 -- Upgrade | (sig)

- 		304d30496e1a970a09fd099b935bda0f12/30/20135.2 MB
-

Ubiquiti Rocket M2/M5 -- Factory Install | (sig)

- 		a9f31346cc1857cc230f54888617482312/30/20135.2 MB
-

Ubiquiti Rocket M2/M5 -- Upgrade | (sig)

- 		a9f31346cc1857cc230f54888617482312/30/20135.2 MB
-

Ubiquiti Unifi Outdoor -- Factory Install | (sig)

- 		fb6b9c9e6897edd61805a1eedce1a25a12/30/20135.2 MB
-

Ubiquiti Unifi Outdoor -- Upgrade | (sig)

- 		45dcfd4d7564bf1fd57025556dffdab912/30/20135.2 MB
-
- - -
- - - - - - - - - - -
TP LinkTL-WDR4300 - COMING SOON!   
-
+

Previous Versions

+

Nightly Builds

Our nightly builds are back! Nightly built images of Commotion OpenWRT are generated from our build server and posted to downloads.commotionwireless.net/nightly. Nightly images contain the most up to date feature and bug fix commites, but should be considered working, yet unstable builds.

From 77fb14f6ed971d8f9c1e5cbd55dc82c1f2ce39b9 Mon Sep 17 00:00:00 2001 From: Chris Ritzo Date: Sun, 6 Apr 2014 18:51:10 -0400 Subject: [PATCH 4/6] Various improvements to the blog index: plugin for posts by category on single category pages, also updates links in index posts by month & year. --- commotionwireless.net/_config.yml | 3 +- .../_includes/site-tag-cloud.html | 2 +- .../_layouts/category_index.html | 16 ++ .../_plugins/generate_categories.rb | 240 ++++++++++++++++++ commotionwireless.net/blog/blogindex.md | 13 +- 5 files changed, 261 insertions(+), 13 deletions(-) create mode 100644 commotionwireless.net/_layouts/category_index.html create mode 100644 commotionwireless.net/_plugins/generate_categories.rb diff --git a/commotionwireless.net/_config.yml b/commotionwireless.net/_config.yml index fdd4b988..bc34d899 100644 --- a/commotionwireless.net/_config.yml +++ b/commotionwireless.net/_config.yml @@ -3,11 +3,12 @@ description: "Commotion is an open-source communication tool that uses mobile ph encoding: utf-8 -url: "staging.commotionwireless.net" +url: "commotionwireless.net" port: 80 piwik: base_url: piwik.opentechinstitute.org site_id: 1 permalink: /blog/:year/:month/:day/:title +category_dir: /blog/category pagination: 3 diff --git a/commotionwireless.net/_includes/site-tag-cloud.html b/commotionwireless.net/_includes/site-tag-cloud.html index 6c9f0fde..a570a302 100644 --- a/commotionwireless.net/_includes/site-tag-cloud.html +++ b/commotionwireless.net/_includes/site-tag-cloud.html @@ -1,6 +1,6 @@

Tags:

{% for category in site.categories %} - {{ category[0] }} ({{ category[1].size }})
+ {{ category[0] }} ({{ category[1].size }})
{% endfor %}
diff --git a/commotionwireless.net/_layouts/category_index.html b/commotionwireless.net/_layouts/category_index.html new file mode 100644 index 00000000..695334b9 --- /dev/null +++ b/commotionwireless.net/_layouts/category_index.html @@ -0,0 +1,16 @@ +--- +layout: default +--- +
+{% for post in site.posts %} + {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} + {% capture this_month %}{{ post.date | date: "%m" }}{% endcapture %} + {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %} + {% capture next_month %}{{ post.previous.date | date: "%m" }}{% endcapture %} + + {% for post in site.categories[page.category] %} +
  • {{ post.title }}
    + {{ post.date | date_to_html_string }} / {{ post.post_author }} Tags: {{ post.categories | category_links }}
    • + {% endfor %} +{% endfor %} +
    diff --git a/commotionwireless.net/_plugins/generate_categories.rb b/commotionwireless.net/_plugins/generate_categories.rb new file mode 100644 index 00000000..7cbeb5e9 --- /dev/null +++ b/commotionwireless.net/_plugins/generate_categories.rb @@ -0,0 +1,240 @@ +# encoding: utf-8 +# +# Jekyll category page generator. +# http://recursive-design.com/projects/jekyll-plugins/ +# +# Version: 0.2.4 (201210160037) +# +# Copyright (c) 2010 Dave Perrett, http://recursive-design.com/ +# Licensed under the MIT license (http://www.opensource.org/licenses/mit-license.php) +# +# A generator that creates category pages for jekyll sites. +# +# To use it, simply drop this script into the _plugins directory of your Jekyll site. You should +# also create a file called 'category_index.html' in the _layouts directory of your jekyll site +# with the following contents (note: you should remove the leading '# ' characters): +# +# ================================== COPY BELOW THIS LINE ================================== +# --- +# layout: default +# --- +# +#

    {{ page.title }}

    +#
      +# {% for post in site.categories[page.category] %} +#
      {{ post.date | date_to_html_string }}
      +#

      {{ post.title }}

      +#
      Filed under {{ post.categories | category_links }}
      +# {% endfor %} +#
    +# ================================== COPY ABOVE THIS LINE ================================== +# +# You can alter the _layout_ setting if you wish to use an alternate layout, and obviously you +# can change the HTML above as you see fit. +# +# When you compile your jekyll site, this plugin will loop through the list of categories in your +# site, and use the layout above to generate a page for each one with a list of links to the +# individual posts. +# +# You can also (optionally) generate an atom.xml feed for each category. To do this, copy +# the category_feed.xml file to the _includes/custom directory of your own project +# (https://github.com/recurser/jekyll-plugins/blob/master/_includes/custom/category_feed.xml). +# You'll also need to copy the octopress_filters.rb file into the _plugins directory of your +# project as the category_feed.xml requires a couple of extra filters +# (https://github.com/recurser/jekyll-plugins/blob/master/_plugins/octopress_filters.rb). +# +# Included filters : +# - category_links: Outputs the list of categories as comma-separated links. +# - date_to_html_string: Outputs the post.date as formatted html, with hooks for CSS styling. +# +# Available _config.yml settings : +# - category_dir: The subfolder to build category pages in (default is 'categories'). +# - category_title_prefix: The string used before the category name in the page title (default is +# 'Category: '). +module Jekyll + + # The CategoryIndex class creates a single category page for the specified category. + class CategoryPage < Page + + # Initializes a new CategoryIndex. + # + # +template_path+ is the path to the layout template to use. + # +site+ is the Jekyll Site instance. + # +base+ is the String path to the . + # +category_dir+ is the String path between and the category folder. + # +category+ is the category currently being processed. + def initialize(template_path, name, site, base, category_dir, category) + @site = site + @base = base + @dir = category_dir + @name = name + + self.process(name) + + if File.exist?(template_path) + @perform_render = true + template_dir = File.dirname(template_path) + template = File.basename(template_path) + # Read the YAML data from the layout page. + self.read_yaml(template_dir, template) + self.data['category'] = category + # Set the title for this page. + title_prefix = site.config['category_title_prefix'] || 'Category: ' + self.data['title'] = "#{title_prefix}#{category}" + # Set the meta-description for this page. + meta_description_prefix = site.config['category_meta_description_prefix'] || 'Category: ' + self.data['description'] = "#{meta_description_prefix}#{category}" + else + @perform_render = false + end + end + + def render? + @perform_render + end + + end + + # The CategoryIndex class creates a single category page for the specified category. + class CategoryIndex < CategoryPage + + # Initializes a new CategoryIndex. + # + # +site+ is the Jekyll Site instance. + # +base+ is the String path to the . + # +category_dir+ is the String path between and the category folder. + # +category+ is the category currently being processed. + def initialize(site, base, category_dir, category) + template_path = File.join(base, '_layouts', 'category_index.html') + super(template_path, 'index.html', site, base, category_dir, category) + end + + end + + # The CategoryFeed class creates an Atom feed for the specified category. + class CategoryFeed < CategoryPage + + # Initializes a new CategoryFeed. + # + # +site+ is the Jekyll Site instance. + # +base+ is the String path to the . + # +category_dir+ is the String path between and the category folder. + # +category+ is the category currently being processed. + def initialize(site, base, category_dir, category) + template_path = File.join(base, '_includes', 'custom', 'category_feed.xml') + super(template_path, 'atom.xml', site, base, category_dir, category) + + # Set the correct feed URL. + self.data['feed_url'] = "#{category_dir}/#{name}" if render? + end + + end + + # The Site class is a built-in Jekyll class with access to global site config information. + class Site + + # Creates an instance of CategoryIndex for each category page, renders it, and + # writes the output to a file. + # + # +category+ is the category currently being processed. + def write_category_index(category) + target_dir = GenerateCategories.category_dir(self.config['category_dir'], category) + index = CategoryIndex.new(self, self.source, target_dir, category) + if index.render? + index.render(self.layouts, site_payload) + index.write(self.dest) + # Record the fact that this pages has been added, otherwise Site::cleanup will remove it. + self.pages << index + end + + # Create an Atom-feed for each index. + feed = CategoryFeed.new(self, self.source, target_dir, category) + if feed.render? + feed.render(self.layouts, site_payload) + feed.write(self.dest) + # Record the fact that this pages has been added, otherwise Site::cleanup will remove it. + self.pages << feed + end + end + + # Loops through the list of category pages and processes each one. + def write_category_indexes + if self.layouts.key? 'category_index' + self.categories.keys.each do |category| + self.write_category_index(category) + end + + # Throw an exception if the layout couldn't be found. + else + throw "No 'category_index' layout found." + end + end + + end + + + # Jekyll hook - the generate method is called by jekyll, and generates all of the category pages. + class GenerateCategories < Generator + safe true + priority :low + + CATEGORY_DIR = 'categories' + + def generate(site) + site.write_category_indexes + end + + # Processes the given dir and removes leading and trailing slashes. Falls + # back on the default if no dir is provided. + def self.category_dir(base_dir, category) + base_dir = (base_dir || CATEGORY_DIR).gsub(/^\/*(.*)\/*$/, '\1') + category = category.gsub(/_|\P{Word}/, '-').gsub(/-{2,}/, '-').downcase + File.join(base_dir, category) + end + + end + + + # Adds some extra filters used during the category creation process. + module Filters + + # Outputs a list of categories as comma-separated links. This is used + # to output the category list for each post on a category page. + # + # +categories+ is the list of categories to format. + # + # Returns string + def category_links(categories) + base_dir = @context.registers[:site].config['category_dir'] + categories = categories.sort!.map do |category| + category_dir = GenerateCategories.category_dir(base_dir, category) + # Make sure the category directory begins with a slash. + category_dir = "/#{category_dir}" unless category_dir =~ /^\// + "#{category}" + end + + case categories.length + when 0 + "" + when 1 + categories[0].to_s + else + categories.join(', ') + end + end + + # Outputs the post.date as formatted html, with hooks for CSS styling. + # + # +date+ is the date object to format as HTML. + # + # Returns string + def date_to_html_string(date) + result = '' + date.strftime('%b').upcase + ' ' + result += date.strftime('%d ') + result += date.strftime('%Y ') + result + end + + end + +end \ No newline at end of file diff --git a/commotionwireless.net/blog/blogindex.md b/commotionwireless.net/blog/blogindex.md index 5bc44ce2..054aee45 100644 --- a/commotionwireless.net/blog/blogindex.md +++ b/commotionwireless.net/blog/blogindex.md @@ -1,17 +1,8 @@ --- title: "Commotion Wireless Blog Index" -layout: blog-index +layout: default lang: en ---
    -

    Posts by Tag

    -{% for category in site.categories %} -

    ▲ {{ category[0] }}

    -
      - {% for post in category[1] %} -
    • {{ post.title }}
      - {{ post.date | date: "%B %d, %Y" }} / {{ post.post_author }}
      • - {% endfor %} -
    -{% endfor %} +{% include posts-by-date.html %}
    From ccfdbb2d7fd6e428f175cac67043a046cec0f6b9 Mon Sep 17 00:00:00 2001 From: Chris Ritzo Date: Mon, 7 Apr 2014 22:23:44 -0400 Subject: [PATCH 5/6] Various improvements to blog tags, tag pages, blog index, posts by date, posts by tag. Orders tags in sidebar alphabetically. Tags link to an autogenerated category page listing posts with that tag chronologically. Blog index page now contains posts by date. Blog top menu item now links to recent posts page (recent.html/md) --- .../_includes/blog-footer.html | 5 +--- .../_includes/blog-rss-block.html | 3 ++- commotionwireless.net/_includes/menu.html | 2 +- .../_includes/posts-by-date-min.html | 12 ++++----- .../_includes/posts-by-date.html | 3 +-- .../_includes/site-tag-cloud.html | 8 +++--- .../_layouts/blog-index.html | 12 +++++---- .../_layouts/category_index.html | 16 +++++------- .../_layouts/category_page.html | 14 +++++++++++ .../_plugins/category_list.rb | 25 +++++++++++++++++++ .../_plugins/generate_categories.rb | 5 ++-- commotionwireless.net/blog/blogindex.md | 8 ------ commotionwireless.net/blog/index.md | 12 ++++----- commotionwireless.net/blog/recent.md | 10 ++++++++ commotionwireless.net/css/commotion.css | 9 +++++++ 15 files changed, 94 insertions(+), 50 deletions(-) create mode 100644 commotionwireless.net/_layouts/category_page.html create mode 100644 commotionwireless.net/_plugins/category_list.rb delete mode 100644 commotionwireless.net/blog/blogindex.md create mode 100644 commotionwireless.net/blog/recent.md diff --git a/commotionwireless.net/_includes/blog-footer.html b/commotionwireless.net/_includes/blog-footer.html index 2c82bf9d..e83470aa 100644 --- a/commotionwireless.net/_includes/blog-footer.html +++ b/commotionwireless.net/_includes/blog-footer.html @@ -1,4 +1 @@ -

    Tags:

    -{% for category in page.categories %} - {{ category }}  -{% endfor %} +

    Tags:

    {{ page.categories | category_links }} diff --git a/commotionwireless.net/_includes/blog-rss-block.html b/commotionwireless.net/_includes/blog-rss-block.html index b4e0cb49..f15cd2d4 100644 --- a/commotionwireless.net/_includes/blog-rss-block.html +++ b/commotionwireless.net/_includes/blog-rss-block.html @@ -1,3 +1,4 @@
    - RSS Feed
    +RSS: RSS Feed + diff --git a/commotionwireless.net/_includes/menu.html b/commotionwireless.net/_includes/menu.html index 510addfa..0fa37335 100644 --- a/commotionwireless.net/_includes/menu.html +++ b/commotionwireless.net/_includes/menu.html @@ -16,7 +16,7 @@
  • Contact
    • -
  • Blog
    • +
  • Blog
  • Get Help diff --git a/commotionwireless.net/_includes/posts-by-date-min.html b/commotionwireless.net/_includes/posts-by-date-min.html index 0aa08d86..37eb3a4c 100644 --- a/commotionwireless.net/_includes/posts-by-date-min.html +++ b/commotionwireless.net/_includes/posts-by-date-min.html @@ -1,22 +1,22 @@ +

    Posts by Date:

    {% for post in site.posts %} {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} {% capture this_month %}{{ post.date | date: "%m" }}{% endcapture %} {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %} {% capture next_month %}{{ post.previous.date | date: "%m" }}{% endcapture %} - {% if forloop.first %} -

    {{this_year}}

    - {{ this_month }} +

    {{this_year}}

    + {{ this_month }} {% endif %} {% if forloop.last %} {% else %} {% if this_year != next_year %} -

    {{next_year}}

    - {{ next_month }} +

    {{next_year}}

    + {{ next_month }} {% else %} {% if this_month != next_month %} - | {{next_month}} + | {{next_month}} {% endif %} {% endif %} {% endif %} diff --git a/commotionwireless.net/_includes/posts-by-date.html b/commotionwireless.net/_includes/posts-by-date.html index 5d4db0b5..fe2cbdb0 100644 --- a/commotionwireless.net/_includes/posts-by-date.html +++ b/commotionwireless.net/_includes/posts-by-date.html @@ -1,11 +1,10 @@
    -

    Posts by Date

    +

    Posts by Date:

    {% for post in site.posts %} {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} {% capture this_month %}{{ post.date | date: "%m" }}{% endcapture %} {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %} {% capture next_month %}{{ post.previous.date | date: "%m" }}{% endcapture %} - {% if forloop.first %}

    ▲ {{this_year}}

    {{ this_month }}

    diff --git a/commotionwireless.net/_includes/site-tag-cloud.html b/commotionwireless.net/_includes/site-tag-cloud.html index a570a302..dc0416ad 100644 --- a/commotionwireless.net/_includes/site-tag-cloud.html +++ b/commotionwireless.net/_includes/site-tag-cloud.html @@ -1,6 +1,6 @@
    -

    Tags:

    -{% for category in site.categories %} - {{ category[0] }} ({{ category[1].size }})
    -{% endfor %} +

    All Tags:

    +
      +{% category_list %} +
    diff --git a/commotionwireless.net/_layouts/blog-index.html b/commotionwireless.net/_layouts/blog-index.html index 83599cef..dc72c583 100644 --- a/commotionwireless.net/_layouts/blog-index.html +++ b/commotionwireless.net/_layouts/blog-index.html @@ -2,11 +2,13 @@ {% include header-nav.html %} {% include pageheadings.html %} {% include content-area-open.html %} -{% include left-half-open.html %} +{% include left-twothird-open.html %} {{ content }} -{% include left-half-close.html %} -{% include right-half-open.html %} -{% include posts-by-date.html %} -{% include right-half-close.html %} +{% include left-twothird-close.html %} +{% include right-col-start.html %} +{% include sub-sections-menu.html %} +{% include posts-by-date-min.html %} +{% include site-tag-cloud.html %} +{% include right-col-end.html %} {% include content-area-close.html %} {% include footer.html %} diff --git a/commotionwireless.net/_layouts/category_index.html b/commotionwireless.net/_layouts/category_index.html index 695334b9..e345c7a9 100644 --- a/commotionwireless.net/_layouts/category_index.html +++ b/commotionwireless.net/_layouts/category_index.html @@ -1,16 +1,12 @@ --- -layout: default +layout: category_page ---
    -{% for post in site.posts %} - {% capture this_year %}{{ post.date | date: "%Y" }}{% endcapture %} - {% capture this_month %}{{ post.date | date: "%m" }}{% endcapture %} - {% capture next_year %}{{ post.previous.date | date: "%Y" }}{% endcapture %} - {% capture next_month %}{{ post.previous.date | date: "%m" }}{% endcapture %} - +
      {% for post in site.categories[page.category] %}
    • {{ post.title }}
      - {{ post.date | date_to_html_string }} / {{ post.post_author }} Tags: {{ post.categories | category_links }}
      • - {% endfor %} -{% endfor %} + {{ post.date | date_to_html_string }} / {{ post.post_author }}
      + Tags: {{ post.categories | category_links }} + {% endfor %} +
    diff --git a/commotionwireless.net/_layouts/category_page.html b/commotionwireless.net/_layouts/category_page.html new file mode 100644 index 00000000..6ee110f3 --- /dev/null +++ b/commotionwireless.net/_layouts/category_page.html @@ -0,0 +1,14 @@ +{% include header.html %} +{% include header-nav.html %} +{% include pageheadings.html %} +{% include content-area-open.html %} +{% include right-col-start.html %} +{% include blog-rss-block.html %} +{% include posts-by-date-min.html %} +{% include site-tag-cloud.html %} +{% include right-col-end.html %} +{% include left-twothird-open.html %} +{{ content }} +{% include left-twothird-close.html %} +{% include content-area-close.html %} +{% include footer.html %} diff --git a/commotionwireless.net/_plugins/category_list.rb b/commotionwireless.net/_plugins/category_list.rb new file mode 100644 index 00000000..d760451e --- /dev/null +++ b/commotionwireless.net/_plugins/category_list.rb @@ -0,0 +1,25 @@ +# place this file in your plugins directory and add the tag to your sidebar +#$ cat source/_includes/custom/asides/categories.html +#
    +#

    Categories

    +#
      +# {% category_list %} +#
    +#
    + +module Jekyll + class CategoryListTag < Liquid::Tag + def render(context) + html = "" + categories = context.registers[:site].categories.keys + categories.sort.each do |category| + category_url = category.gsub(' ','-') + posts_in_category = context.registers[:site].categories[category].size + html << "
  • #{category} (#{posts_in_category})
    • \n" + end + html + end + end +end + +Liquid::Template.register_tag('category_list', Jekyll::CategoryListTag) diff --git a/commotionwireless.net/_plugins/generate_categories.rb b/commotionwireless.net/_plugins/generate_categories.rb index 7cbeb5e9..15811622 100644 --- a/commotionwireless.net/_plugins/generate_categories.rb +++ b/commotionwireless.net/_plugins/generate_categories.rb @@ -106,6 +106,7 @@ class CategoryIndex < CategoryPage # +category+ is the category currently being processed. def initialize(site, base, category_dir, category) template_path = File.join(base, '_layouts', 'category_index.html') + category = category.gsub('%20','-') super(template_path, 'index.html', site, base, category_dir, category) end @@ -210,7 +211,7 @@ def category_links(categories) category_dir = GenerateCategories.category_dir(base_dir, category) # Make sure the category directory begins with a slash. category_dir = "/#{category_dir}" unless category_dir =~ /^\// - "#{category}" + "#{category.gsub('%20','-')}" end case categories.length @@ -237,4 +238,4 @@ def date_to_html_string(date) end -end \ No newline at end of file +end diff --git a/commotionwireless.net/blog/blogindex.md b/commotionwireless.net/blog/blogindex.md deleted file mode 100644 index 054aee45..00000000 --- a/commotionwireless.net/blog/blogindex.md +++ /dev/null @@ -1,8 +0,0 @@ ---- -title: "Commotion Wireless Blog Index" -layout: default -lang: en ---- -
    -{% include posts-by-date.html %} -
    diff --git a/commotionwireless.net/blog/index.md b/commotionwireless.net/blog/index.md index 41b389f6..f24818ba 100644 --- a/commotionwireless.net/blog/index.md +++ b/commotionwireless.net/blog/index.md @@ -1,10 +1,8 @@ --- -layout: blog-front -title: Commotion Blog -categories: -created: 2014-01-14 -changed: 2014-01-15 -post_author: Chris Ritzo +title: "Commotion Wireless Blog Index" +layout: blog-index lang: en --- -

    Recent Blog Posts

    +
    +{% include posts-by-date.html %} +
    diff --git a/commotionwireless.net/blog/recent.md b/commotionwireless.net/blog/recent.md new file mode 100644 index 00000000..41b389f6 --- /dev/null +++ b/commotionwireless.net/blog/recent.md @@ -0,0 +1,10 @@ +--- +layout: blog-front +title: Commotion Blog +categories: +created: 2014-01-14 +changed: 2014-01-15 +post_author: Chris Ritzo +lang: en +--- +

    Recent Blog Posts

    diff --git a/commotionwireless.net/css/commotion.css b/commotionwireless.net/css/commotion.css index 749855f6..bbee65ee 100644 --- a/commotionwireless.net/css/commotion.css +++ b/commotionwireless.net/css/commotion.css @@ -636,6 +636,9 @@ div.cck-download-pdf { .blog-index a:hover { border-bottom: 3px solid #FF739C; } +.blog-index ul li { + margin-bottom: 1em; +} .bug-report { display: block; background-color: #877AED; @@ -681,3 +684,9 @@ div.cck-download-pdf { background: #000000; color: #FFFFFF; } +.tag { + padding-left: .5em; +} +.index-day { + padding-left: .5em; +} From 9c2dfe8fd220547538218956bccece7448e2af71 Mon Sep 17 00:00:00 2001 From: Chris Ritzo Date: Mon, 7 Apr 2014 22:32:30 -0400 Subject: [PATCH 6/6] Updated tag links on recent blog posts page. --- commotionwireless.net/_includes/blog-front-content.html | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/commotionwireless.net/_includes/blog-front-content.html b/commotionwireless.net/_includes/blog-front-content.html index 219837c5..36734db7 100644 --- a/commotionwireless.net/_includes/blog-front-content.html +++ b/commotionwireless.net/_includes/blog-front-content.html @@ -6,11 +6,7 @@

    {{ post.title }}

    {{ post.date | date: "%B %d, %Y" }} {{ post.post_author }}

    {{ post.content | split:'' | first | strip_html }}

    Read More -
    -{% for category in post.categories %} - {{ category }}  -{% endfor %} -
    +
    {{ post.categories | category_links }}
    {% endfor %}