updated sites

Rakefile

@@ -65,10 +65,10 @@ private
 
 def updateConfig(rep)
   lines = IO.readlines("_config.yml");
-  lines[-1] = rep
+  lines[0] = rep
   File.open("_config.yml","w") do |file|
     lines.each do |line|
-      file.write(line)
+      file.puts(line)
     end
   end
 end

_config.yml

@@ -1,3 +1,2 @@
 env: dev
-pygments: true
-env: prod
+permalink: pretty

_includes/footer.html

@@ -1,7 +1,35 @@
       <div class="push"></div>
-    </div>
-    <footer>
-      &copy; 2010 Will Gretz
-    </footer>
+      <footer>
+        <p>&copy; 2010 Will Gretz</p>
+      </footer>
+    </div><script type="text/javascript">
+          /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+          var disqus_developer = 1; // this would set it to developer mode
+          var disqus_shortname = 'willgretz'; // required: replace example with your forum shortname
+
+          /* * * DON'T EDIT BELOW THIS LINE * * */
+          (function () {
+              var s = document.createElement('script'); s.async = true;
+              s.type = 'text/javascript';
+              s.src = 'http://' + disqus_shortname + '.disqus.com/count.js';
+              (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+          }());
+
+          (function() {
+              var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+              dsq.src = 'http://' + disqus_shortname + '.disqus.com/embed.js';
+              (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+          })();
+
+          var _gaq = _gaq || [];
+          _gaq.push(['_setAccount', 'UA-22490515-1']);
+          _gaq.push(['_trackPageview']);
+
+          (function() {
+            var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+            ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+            var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+          })();
+      </script>
   </body>
 </html>

_includes/header-body.html

@@ -4,7 +4,8 @@
   <header>
     <a href="/" id="masthead">Will Gretz</a>
     <ul>
-      <li><a href="coming-soon.html">Resume</a></li>
+      <li><a href="/resume">Resume</a></li>
+      <li><a href="/about">About Me</a></li>
       <li><a href="/">Blog</a></li>
     </ul>
   </header>

_includes/header-doc.html

@@ -5,6 +5,7 @@
     <meta name="author" content="Will Gretz" />
     <link href="/stylesheets/main.css" rel="stylesheet" />
     <link href="/stylesheets/code.css" rel="stylesheet" />
+    <link href="http://fonts.googleapis.com/css?family=PT+Sans:regular,italic,bold,bolditalic" rel="stylesheet" type="text/css" >
     <!--[if lt IE 9]>
       <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
       <script src="excanvas.js"></script>

_layouts/post.html

@@ -4,12 +4,18 @@
 <div id="content">
 <h1>{{page.title}}</h1>
 {{ content }}
+
+<div id="disqus_thread"></div>
+<noscript>Please enable JavaScript to view the <a href="http://disqus.com/?ref_noscript">comments powered by Disqus.</a></noscript>
+<a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
+
 </div>
 <div class="sidebar-module">
 <h2> Recent Posts </h2>
 {% for post in site.posts limit:5 %}
   <li>{{post.date | date_to_string}} - <a href="{{post.url}}">{{post.title}}</a></li>
 {% endfor %}
-</div>    
+<div id="popularthreads" class="dsq-widget"><h2 class="dsq-widget-title">Popular Threads</h2><script type="text/javascript" src="http://wgretztestblog.disqus.com/popular_threads_widget.js?num_items=5"></script></div>
+</div>
 
 {% include footer.html %}

_plugins/nonprojectposts.rb

@@ -0,0 +1,31 @@
+module Jekyll
+
+  class Site
+
+    def nonprojectposts
+      post_col = []
+      self.posts.each do |post|
+        post_col << post unless post.categories.include?("projects")
+      end
+
+      return post_col.reverse
+    end
+
+    # Redefine site_payload to include our posts by year.  This is ugly
+    # but I don't know how else to do this without changing the jekyll code
+    # itself.  #rubynoob
+    def site_payload
+      {"site" => self.config.merge({
+          "time"       => self.time,
+          "posts"      => self.posts.sort { |a,b| b <=> a },
+          "pages"      => self.pages,
+          "html_pages" => self.pages.reject { |page| !page.html? },
+          "categories" => post_attr_hash('categories'),
+          "tags"       => post_attr_hash('tags'),
+          "nonprojectposts" => self.nonprojectposts
+       })}
+    end
+
+  end
+
+end

_posts/2010-03-09-this-site.mdwn

@@ -0,0 +1,6 @@
+---
+layout: post
+categories: projects
+preview: this-site1.png
+---
+Testing

_posts/2010-04-06-introductions.mdwn

@@ -0,0 +1,13 @@
+---
+title: Introductions
+layout: post
+categories: personal programming introductions
+---
+
+My site has gone through several incarnations. Hundreds if you count the sites I used to make when I first began learning html in middle school.  I've always had problems finishing them and commiting to a design.  
+
+Once I began learning to program I tried several times to build a blog of my own design.  I'd always get close to something I liked and then would decide I wanted to try a new technology or add a new feature to it and so I never got anything finished with it.  Recently I decided to learn how [Wordpress](http://wordpress.com) worked in an attempt to build something for a few friends projects. Several things got in the way of finishing learning wordpress and I decided I needed a blog now so I can share with the world, or at least so I don't forget what I learned. And I decided instead of trying to adapt my rails site into a wordpress template Instead of screwing around trying to convert html pages into a wordpress template and learn the ins and outs of how wordpress structures its files.
+
+And I wrote everything before this over a month ago.  The processes I needed to record are currently being put into a presentation by a coworker [Chris Reister](http://chrisreister.com) and will hopefully be posted up here later, as well as at his site.  The main reason I've decided to come back to this project is recently one of my cousins started a blog of his own and has kind of made me want to finish my own blog.
+
+So that's that.  I've finally got my first blog article written up, and I am mostly happy with the layout of the site, I've got a few tweaks here and there and finish up writing content for other unpublished pages.  Hopefully it won't take me a few more months to write a second blog article.

_sass/main.scss

@@ -3,8 +3,8 @@
 @import "compass/layout/sticky-footer";
 @import "compass/reset/utilities";
 
-@include sticky_footer(4em, ".wrapper","footer",".push");
 @include reset-html5;
+@include global-reset;
 
 @include font-face('mizike', font-files("/fonts/mizike.woff", woff, "/fonts/mizike.ttf", truetype, "/fonts/mizike.svg#webfontKnyf1ui5", svg));
 
@@ -19,13 +19,46 @@
 
 $link-color: #A1C820;
 
+html {
+  height: 100%;
+}
+
 body {
   margin: 0px;
   padding: 0px;
   background: #666;
   font-size: 13px;
+  font-family: 'PT Sans';
+  height: 100%;
 }
+
+h2{
+  font-size: 1.6em;
+  margin: 5px;
+}
+
+footer{
+  background: #000;
+  clear: both;
+  margin-top: 5px;
+  color: #fff;
+
+  .elem{
+    @include grid(4);
+  }
+
+  .elemfirst{
+    @include grid(4,true);
+  } 
 
+  p{
+    margin: 10px auto 0;
+    padding: 10px;
+    text-align: center;
+    border-top: 1px solid grey;
+  }
+}
+
 header {
   background: url('/images/banner.png');
   height: 100px;
@@ -78,11 +111,9 @@ header {
 
 .wrapper {
   width: 978px;
-  height: auto !important;
-  height: 100%;
-  margin: 0 auto -4em;
-  @include radial-gradient(color_stops(#E1FFD6,#fff), top center )
-
+  margin: 0 auto;
+  @include radial-gradient(color_stops(#E1FFD6,#fff), top center );
+  min-height: 100%;
 }
 
 h1 {
@@ -101,6 +132,7 @@ pre{
   color: #FFF;
 }
 
+
 #content{
   @include grid(9,true);
   font-size: 15px;
@@ -110,6 +142,125 @@ pre{
   @include grid(3);
 }
 
+#featured-projects{
+  @include grid(6,true);
+}
+
+#recent-articles{
+  @include grid(6);
+}
+
+.project-preview{
+  width: 460px;
+  height: 270px;
+  background: #999;
+  margin: 0px auto;
+  position: relative;
+}
+
+.project-img{
+  width: 460;
+  height: 270px;
+  position: absolute;
+}
+
+#intro-spacer-one{
+  @include grid(2,true);
+}
+
+#intro-spacer-two{
+  @include grid(2);
+}
+
+#intro{
+  @include grid(8);
+  font-size: 22px;
+  text-align: justify;
+  line-height: 1.1em;
+  padding-bottom: 7px 5px;
+
+} 
+
+.name {
+  font-family: Mizike;
+  font-size: 1.1em;
+}
+
+.project-title{
+  position: absolute;
+  background: rgba(255,255,255,.8);
+  bottom: 20px;
+  right: 0;
+  width: 80%;
+  font-size: 16px;
+  font-family: Mizike;
+  line-height: 1em;
+  text-align: right;
+}
+
+#featured-projects{
+
+  font-size: 16px;
+
+  a {
+    text-decoration: none;
+    color: #000;
+  }
+
+  a:hover {
+    color: #0F0;
+  }
+
+  .project-title {
+
+    h2{
+      margin: 0.3em 5px;
+    }
+
+    span{
+      margin: 0 5px;
+    }
+
+  }
+
+}
+
+.clear{
+  clear: both;
+}
+
+#recent-articles{
+  font-size: 16px;
+}
+
+#recent-articles ul{
+  list-style-type: disc;
+  margin: 0 20px;
+}
+
+#most-recent{
+  margin-bottom: 5px;
+
+  h2{
+   font-size: 36px;
+   margin: 5px;
+  }
+
+  .byline {
+    color: #999;
+  }
+
+}
+
+#content-column{
+  @include grid(9, true);
+
+}
+
+#disqus_thread {
+  margin: 7px !important ;
+}
+
 .hll { background-color: #ffffcc }
 .c { color: #408080; font-style: italic } /* Comment */
 .err { border: 1px solid #FF0000 } /* Error */

about.html

@@ -0,0 +1,8 @@
+---
+layout: default
+---
+<div id="content-column">
+  <p>I'm a 22 year old web developer, a gamer and husband.  I am currently taking a break from school but would love to eventually go back and either get a BS in computer science or a degree in business.</p>
+  <p>I've had a passion for building web pages since Jr. High.  However after high school I really wanted to go to College and study psychology, but after figuring out how long I'd need to be in school I thought I should get a degree in web development so I could make some money and go back to get a degree in psychology.  However after a few quarters I was thoroughly hooked on developing web applications.</p>
+  <p>When I'm not working on a something for my employer or a personal project I like to spend time with my wife and friends playing board or card games.</p>
+</div>

index.html

@@ -1,9 +1,19 @@
 ---
 layout: default
 ---
-
-{% for post in site.posts limit:5 %}
-  <article><h2><a href="{{post.url}}">{{post.title}}</a></h2>
-  <p>{{post.date | date: "%B %d, %Y" }}</p>
-  </article>
-{% endfor %}
+<div id="content-column">
+  <div id="most-recent">
+    {% for post in site.nonprojectposts limit:1 %}
+    <h2>{{ post.title }}</h2>
+    <p class="byline">Posted {{post.date | date: "%B %e, %Y"}} in {{post.categories | array_to_sentence_string }}</p>
+    {{post.content}}
+    <p><a href="{{post.url}}#disqus_thread">Comments</a></p>
+    {% endfor %}
+  </div>
+</div>
+<div id="column">
+  {% for post in site.nonprojectposts %}
+    <li><a href="{{post.url}}">{{post.title}}</a><br />
+      <span>{{post.date | date: "%B %e, %Y" }}</li>
+  {% endfor %}
+</div>