Changeset 1102

Timestamp:

04/30/10 11:15:17 (22 months ago)

Author:

dordille

Message:

Improvements for displaying images with blogSlots. #302.

Location:

plugins/apostropheBlogPlugin/trunk

Files:

• lib/model/doctrine/PluginaBlogItem.class.php (modified) (3 diffs)
• lib/model/doctrine/PluginaBlogItemTable.class.php (modified) (3 diffs)
• modules/aBlog/lib/BaseaBlogActions.class.php (modified) (1 diff)
• modules/aBlog/templates/_singleColumnTemplate_slot.php (modified) (1 diff)
• modules/aBlogSingleSlot/actions/components.class.php (modified) (1 diff)
• modules/aBlogSingleSlot/templates/_normalView.php (modified) (1 diff)
• modules/aBlogSlot/actions/components.class.php (modified) (1 diff)
• modules/aBlogSlot/templates/_normalView.php (modified) (1 diff)

plugins/apostropheBlogPlugin/trunk/lib/model/doctrine/PluginaBlogItem.class.php

@@ -95 +95 @@
       foreach($this->Page->getArea($area) as $slot)
       {
-        if(method_exists($slot, 'getSearchText'))
+        if(method_exists($slot, 'getText'))
         {
-          $text .= strip_tags($slot->getValue());
+          $text .= strip_tags($slot->getText());
         }
       }
@@ -119 +119 @@
     return $this->getTextForAreas(array($area), $limit);
   }
+
+  public function getMediaForArea($area, $type = null, $limit = null)
+  {
+    return $this->getMediaForAreas(array($area), $type, $limit);
+  }
+
+  /**
+   * Given an array of array this function returns the mediaItems in those areas.
+   * @param  aArea $areas
+   * @param  $type Set the type of media to return (image, video, pdf, etc...)
+   * @param  $limit Limit the number of mediaItems returned
+   * @return array aMediaItems
+   */
+  public function getMediaForAreas($areas, $type = null, $limit = 9999)
+  {
+    $aMediaItems = array();
+    foreach($areas as $area)
+    {
+      foreach($this->Page->getArea($area) as $slot)
+      {
+        foreach($slot->MediaItems as $aMediaItem)
+        {
+          if(is_null($type) || $aMediaItem['type'] == $type)
+          {
+            $limit = $limit - 1;
+            $aMediaItems[] = $aMediaItem;
+            if($limit == 0) return $aMediaItems;
+          }
+        }
+      }
+    }
+    return $aMediaItems;
+  }
   
   public function getFeedText()
@@ -125 +158 @@
     foreach($this->Page->getArea('blog-body') as $slot)
     {
-      if(method_exists($slot, 'getSearchText'))
-      {
-        $text .= $slot->getSearchText();
+      if(method_exists($slot, 'getText'))
+      {
+        $text .= $slot->getText();
       }
     }

plugins/apostropheBlogPlugin/trunk/lib/model/doctrine/PluginaBlogItemTable.class.php

@@ -48 +48 @@
     return Doctrine::getTable('aBlogCategory')->addCategoriesForUser($user, $admin, $q);
   }
-  
+
+
   public function addCategories(Doctrine_Query $q=null)
   {
@@ -58 +59 @@
   }
 
+  /**
+   * Given an array of blogItems this function will populate its virtual page
+   * areas with the current slot versions.
+   * @param aBlogItem $blogItems
+   */
   public static function populatePages($blogItems)
   {    
@@ -69 +75 @@
       $q = aPageTable::queryWithSlots();
       $q->whereIn('id', $pageIds);
-      $q->execute();
+      $pages = $q->execute();
+      aTools::cacheVirtualPages($pages);
     }
   }

plugins/apostropheBlogPlugin/trunk/modules/aBlog/lib/BaseaBlogActions.class.php

@@ -52 +52 @@
     
     $this->pager = $pager;
-    
+
+    aBlogItemTable::populatePages($pager->getResults());
+
     if($this->getRequestParameter('feed', false))
     {

plugins/apostropheBlogPlugin/trunk/modules/aBlog/templates/_singleColumnTemplate_slot.php

@@ -1 @@
-<?php echo $aBlogPost->getTextForArea('blog-body', 100) ?>
+<div class="a-blog-post-excerpt">
+<?php echo $aBlogPost->getTextForArea('blog-body', $options['excerptLength']) ?>
+</div>
 
+<div class="a-blog-post-media">
+<?php include_component('aSlideshowSlot', 'slideshow', array(
+  'items' => $aBlogPost->getMediaForArea('blog-body', 'image', 1),
+  'id' => 'test',
+  'options' => $options['slideshowOptions']
+  )) ?>
+</div>
+

plugins/apostropheBlogPlugin/trunk/modules/aBlogSingleSlot/actions/components.class.php

@@ -26 +26 @@
       aBlogItemTable::populatePages(array($this->aBlogItem));
     }
+    $this->options['word_count'] = $this->getOption('word_count', 100);
+    if(!isset($this->options['slideshowOptions']))
+      $this->options['slideshowOptions'] = array();
+
+    $this->options['excerptLength'] = $this->getOption('excerptLength', 200);
   }
 }

plugins/apostropheBlogPlugin/trunk/modules/aBlogSingleSlot/templates/_normalView.php

@@ -2 +2 @@
 <?php if (isset($values['blog_item'])): ?>
   <h2><?php echo $aBlogItem['title'] ?></h2>
-  <?php include_partial('aBlog/'.$aBlogItem['template'].'_slot', array('aBlogPost' => $aBlogItem)) ?>
+  <?php include_partial('aBlog/'.$aBlogItem['template'].'_slot', array('aBlogPost' => $aBlogItem, 'options' => $options)) ?>
 <?php endif ?>

plugins/apostropheBlogPlugin/trunk/modules/aBlogSlot/actions/components.class.php

@@ -31 +31 @@
       $q->limit($this->values['count']);
 
+    if(!isset($this->options['slideshowOptions']))
+      $this->options['slideshowOptions'] = array();
+
+    $this->options['excerptLength'] = $this->getOption('excerptLength', 200);
     
     $this->aBlogPosts = $q->execute();

plugins/apostropheBlogPlugin/trunk/modules/aBlogSlot/templates/_normalView.php

@@ -15 +15 @@
 
       <div class="a-blog-post-excerpt-container">
-        <?php include_partial('aBlog/'.$aBlogPost['template'].'_slot', array('aBlogPost' => $aBlogPost)) ?>
+        <?php include_partial('aBlog/'.$aBlogPost['template'].'_slot', array('aBlogPost' => $aBlogPost, 'options' => $options)) ?>
         <div class="a-blog-read-more">
           <?php echo link_to('Read More', 'a_blog_post', $aBlogPost, array('class' => 'a-blog-more')) ?>