Adding meetings as a new category, adding meetings as a new navigation item

aaronr · aaronr · commit 1759c69cd287 · 2013-02-18T11:31:15.000-08:00
diff --git a/_posts/events/2013-05-22-foss4g-na.markdown b/_posts/events/2013-05-22-foss4g-na.markdown
@@ -1,7 +1,7 @@
 ---
 layout: post
 title: Foss4g NA 2013
-category: event
+category: events
 
 excerpt: Great Foss4g NA event for 2013
 ---
diff --git a/_posts/meetings/2013-02-20-cugos_monthly.markdown b/_posts/meetings/2013-02-20-cugos_monthly.markdown
@@ -1,7 +1,7 @@
 ---
 layout: post
 title: Feb 20th 2013 - LizardTech
-category: cugos_meetings
+category: meetings
 
 excerpt: Feb 2013 CUGOS Monthly Meeting at LizardTech (6pm)
 ---
diff --git a/_posts/presentations/2012-01-18-presentation1.markdown b/_posts/presentations/2012-01-18-presentation1.markdown
@@ -1,7 +1,7 @@
 ---
 layout: post
 title: Presentation1
-category: presentation
+category: presentations
 
 excerpt: Short text about presentation
 ---
diff --git a/_posts/projects/2012-12-01-projfinder.markdown b/_posts/projects/2012-12-01-projfinder.markdown
@@ -1,8 +1,9 @@
 ---
 layout: post
 title: ProjFinder
-category: project
+category: projects
 
+permalink: /projects/projfinder
 excerpt: Projection Finder project used for code sprints with CUGOS
 ---
  
diff --git a/_posts/projects/2013-02-14-cugos-website.markdown b/_posts/projects/2013-02-14-cugos-website.markdown
@@ -1,8 +1,9 @@
 ---
 layout: post
 title: Migrate CUGOS website to Jekyll on GitPages
-category: project
+category: projects
 
+permalink: /projects/jekyll
 excerpt: Migrating the CUGOS website to GitPages on GitHub with Jekyll
 ---
  
diff --git a/about/index.md b/about/index.md
@@ -1,7 +1,8 @@
 ---
 layout: default
 title: About
-weight: 6
+weight: 7
+permalink: /
 ---
 
 About
diff --git a/blog/index.html b/blog/index.html
@@ -1,7 +1,8 @@
 ---
 layout: default
 title: Blog
-weight: 3
+weight: 4
+permalink: /
 ---
 
      <h2>Blog</h2>
diff --git a/contact/index.html b/contact/index.html
@@ -1,7 +1,8 @@
 ---
 layout: default
 title: Contact
-weight: 7
+weight: 8
+permalink: /
 ---
 
       <p class="lead">
diff --git a/events/index.html b/events/index.html
@@ -1,11 +1,12 @@
 ---
 layout: default
 title: Events
-weight: 1
+weight: 2
+permalink: /
 ---
 
      <h2>Events</h2>
-{% for event in site.categories.event %}
+{% for event in site.categories.events %}
       <div class="row">
         <div class="span12">
           <div class="event">
diff --git a/index.html b/index.html
@@ -3,7 +3,7 @@
 title: Home
 ---
 
-{% for meeting in site.categories.cugos_meetings limit: 1  %}
+{% for meeting in site.categories.meetings limit: 1  %}
       <div class="alert alert-info">
         <h4>Next CUGOS meeting: <a style="color:black;" href={{ meeting.url }}>{{ meeting.title }}</a></h4>
       </div>
@@ -18,7 +18,7 @@ <h2 style="color:white;">CUGOS in Action</h2>
       <div class="row">
         <div class="span4">
           <h2>Upcoming Events</h2>
-{% for event in site.categories.event limit: 2  %}
+{% for event in site.categories.events limit: 2  %}
           <div class="event">
             <h4><a href={{ event.url }}>{{ event.title }}</a></h4>
             <span class="date">{{ event.date | date_to_string }}</span>
@@ -38,10 +38,9 @@ <h4><a href={{ blog.url }}>{{ blog.title }}</a></h4>
        </div>
         <div class="span4">
           <h2>Latest Projects</h2>
-{% for project in site.categories.project limit: 2  %}
+{% for project in site.categories.projects limit: 2  %}
           <div class="project">
             <h4><a href={{ project.url }}>{{ project.title }}</a></h4>
-            <span class="date">{{ project.date | date_to_string }}</span>
             <div class="entry">{{ project.excerpt }}</div>
           </div>
 {% endfor %}
diff --git a/meetings/index.html b/meetings/index.html
@@ -0,0 +1,20 @@
+---
+layout: default
+title: Meetings
+weight: 1
+permalink: /
+---
+
+     <h2>CUGOS Meetings</h2>
+{% for meeting in site.categories.meetings %}
+      <div class="row">
+        <div class="span12">
+          <div class="event">
+            <h3><a href={{ meeting.url }}>{{ meeting.title }}</a></h3>
+            <span class="date">{{ meeting.date | date_to_string }}</span>
+            <div class="entry">{{ meeting.content }}</div>
+          </div>
+        </div>
+      </div>
+{% endfor %}
+
diff --git a/people/index.html b/people/index.html
@@ -1,7 +1,8 @@
 ---
 layout: default
 title: People
-weight: 5
+weight: 6
+permalink: /
 ---
 
      <h2>People</h2>
diff --git a/presentations/index.html b/presentations/index.html
@@ -1,11 +1,12 @@
 ---
 layout: default
 title: Presentations
-weight: 2
+weight: 3
+permalink: /
 ---
 
      <h2>Presentations</h2>
-{% for presentation in site.categories.presentation %}
+{% for presentation in site.categories.presentations %}
       <div class="row">
         <div class="span12">
           <div class="presentation">
diff --git a/projects/index.html b/projects/index.html
@@ -1,17 +1,17 @@
 ---
 layout: default
 title: Projects
-weight: 4
+weight: 5
+permalink: /
 ---
 
      <h2>Projects</h2>
-{% for project in site.categories.project %}
+{% for project in site.categories.projects %}
       <div class="row">
         <div class="span12">
           <div class="project">
             <h3><a href={{ project.url }}>{{ project.title }}</a></h3>
-            <span class="date">{{ project.date | date_to_string }}</span>
-            <div class="entry">{{ project.content }}</div>
+            <div class="entry">{{ project.excerpt }}</div>
           </div>
         </div>
       </div>
