From af936d474281df05dc2cb368530782cb7cdcde74 Mon Sep 17 00:00:00 2001
From: "Jonathan.Wage" <Jonathan.Wage@625475ce-881a-0410-a577-b389adb331d8>
Date: Thu, 6 Sep 2007 17:42:07 +0000
Subject: [PATCH] Fleshing out content and committed some new files.

---
 .../modules/blog/actions/actions.class.php        |  4 +++-
 .../modules/blog/actions/components.class.php     | 10 ++++++++++
 .../modules/blog/templates/_latest_blog_posts.php |  8 ++++++++
 .../modules/blog/templates/indexSuccess.php       | 15 +++++++++++++++
 .../modules/blog/templates/viewSuccess.php        |  6 +++++-
 .../modules/main/actions/actions.class.php        |  3 ---
 .../modules/main/templates/indexSuccess.php       |  9 +--------
 website/apps/frontend/templates/_menu.php         |  1 +
 8 files changed, 43 insertions(+), 13 deletions(-)
 create mode 100644 website/apps/frontend/modules/blog/actions/components.class.php
 create mode 100644 website/apps/frontend/modules/blog/templates/_latest_blog_posts.php

diff --git a/website/apps/frontend/modules/blog/actions/actions.class.php b/website/apps/frontend/modules/blog/actions/actions.class.php
index 62510af4a..48e27568d 100644
--- a/website/apps/frontend/modules/blog/actions/actions.class.php
+++ b/website/apps/frontend/modules/blog/actions/actions.class.php
@@ -16,7 +16,9 @@ class blogActions extends sfActions
    */
   public function executeIndex()
   {
-
+    $blogPostTable = Doctrine_Manager::getInstance()->getTable('BlogPost');
+    
+    $this->latestBlogPosts = $blogPostTable->retrieveLatest(5);
   }
   
   public function executeView()
diff --git a/website/apps/frontend/modules/blog/actions/components.class.php b/website/apps/frontend/modules/blog/actions/components.class.php
new file mode 100644
index 000000000..790669a99
--- /dev/null
+++ b/website/apps/frontend/modules/blog/actions/components.class.php
@@ -0,0 +1,10 @@
+<?php
+class blogComponents extends sfComponents
+{
+  public function executeLatest_blog_posts()
+  {
+    $blogPostTable = Doctrine_Manager::getInstance()->getTable('BlogPost');
+    
+    $this->latestBlogPosts = $blogPostTable->retrieveLatest(5);
+  }
+}
\ No newline at end of file
diff --git a/website/apps/frontend/modules/blog/templates/_latest_blog_posts.php b/website/apps/frontend/modules/blog/templates/_latest_blog_posts.php
new file mode 100644
index 000000000..a34fffa22
--- /dev/null
+++ b/website/apps/frontend/modules/blog/templates/_latest_blog_posts.php
@@ -0,0 +1,8 @@
+<div id="latest_blog_posts">
+  <h3>Latest Blog Posts</h3>
+  <ul>
+    <?php foreach($latestBlogPosts AS $blogPost): ?>
+      <li><?php echo link_to($blogPost->getName(), '@blog_post?slug='.$blogPost->getSlug()); ?></li>
+    <?php endforeach; ?>
+  </ul>
+</div>
\ No newline at end of file
diff --git a/website/apps/frontend/modules/blog/templates/indexSuccess.php b/website/apps/frontend/modules/blog/templates/indexSuccess.php
index e69de29bb..3e880370e 100644
--- a/website/apps/frontend/modules/blog/templates/indexSuccess.php
+++ b/website/apps/frontend/modules/blog/templates/indexSuccess.php
@@ -0,0 +1,15 @@
+<div class="content" id="blog">
+  <h1>Doctrine Blog</h2>
+  
+  <?php foreach($latestBlogPosts AS $blogPost): ?>
+    <div class="blog_post">
+      <h2><?php echo link_to($blogPost->getName(), '@blog_post?slug='.$blogPost->getSlug()); ?></h2>
+      
+      <p><?php echo $blogPost->getBody(); ?></p>
+    </div>
+  <?php endforeach; ?>
+</div>
+
+<?php slot('right'); ?>
+  <?php echo get_partial('latest_blog_posts', array('latestBlogPosts' => $latestBlogPosts)); ?>
+<?php end_slot(); ?>
\ No newline at end of file
diff --git a/website/apps/frontend/modules/blog/templates/viewSuccess.php b/website/apps/frontend/modules/blog/templates/viewSuccess.php
index aa6b85a2f..4fbfea5cb 100644
--- a/website/apps/frontend/modules/blog/templates/viewSuccess.php
+++ b/website/apps/frontend/modules/blog/templates/viewSuccess.php
@@ -4,4 +4,8 @@
 
 <?php slot('right'); ?>
   <input type="button" name="back_to_blog" value="Back to Blog" onClick="javascript: location.href = '<?php echo url_for('@blog'); ?>';" />
-<?php end_slot(); ?>
\ No newline at end of file
+  
+  <br/><br/>
+  
+  <?php echo get_component('blog', 'latest_blog_posts'); ?>
+<?php end_slot(); ?>
diff --git a/website/apps/frontend/modules/main/actions/actions.class.php b/website/apps/frontend/modules/main/actions/actions.class.php
index 4add2076e..9638f9f0d 100644
--- a/website/apps/frontend/modules/main/actions/actions.class.php
+++ b/website/apps/frontend/modules/main/actions/actions.class.php
@@ -16,9 +16,6 @@ class mainActions extends sfActions
    */
   public function executeIndex()
   {
-    $blogPostTable = Doctrine_Manager::getInstance()->getTable('BlogPost');
-    
-    $this->latestBlogPosts = $blogPostTable->retrieveLatest(5);
   }
   
   public function executeAbout()
diff --git a/website/apps/frontend/modules/main/templates/indexSuccess.php b/website/apps/frontend/modules/main/templates/indexSuccess.php
index 6b8a6f64f..c624e0e1a 100644
--- a/website/apps/frontend/modules/main/templates/indexSuccess.php
+++ b/website/apps/frontend/modules/main/templates/indexSuccess.php
@@ -17,12 +17,5 @@
     </ul>
   </div>
   
-  <div id="latest_blog_posts">
-    <h3>Latest Blog Posts</h3>
-    <ul>
-      <?php foreach($latestBlogPosts AS $blogPost): ?>
-        <li><?php echo link_to($blogPost->getName(), '@blog_post?slug='.$blogPost->getSlug()); ?></li>
-      <?php endforeach; ?>
-    </ul>
-  </div>
+  <?php echo get_component('blog', 'latest_blog_posts'); ?>
 <?php end_slot(); ?>
\ No newline at end of file
diff --git a/website/apps/frontend/templates/_menu.php b/website/apps/frontend/templates/_menu.php
index 38ba30bf8..2304a9c01 100644
--- a/website/apps/frontend/templates/_menu.php
+++ b/website/apps/frontend/templates/_menu.php
@@ -4,5 +4,6 @@
   <li><?php echo link_to('download', '@download'); ?></li>
   <li><?php echo link_to('manual', '@manual'); ?></li>
   <li><?php echo link_to('api docs', '@api_documentation'); ?></li>
+  <li><?php echo link_to('blog', '@blog'); ?></li>
   <li id="last"><?php echo link_to('trac', '@trac'); ?></li>
 </ul>
\ No newline at end of file