Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkdru

[mkdru-moved-to-drupal.org.git] / mkdru.module

diff --git a/mkdru.module b/mkdru.module
index ac06097..eae89e1 100644 (file)
--- a/mkdru.module
+++ b/mkdru.module
@@ -246,12 +246,12 @@ function mkdru_theme() {
     ),
     'mkdru_block_search' => array(
       'template' => 'mkdru-block-search',
-      'arguments' => array('nid' => null, 'path' => NULL),
+      'arguments' => array('nid' => NULL, 'path' => NULL),
     ),
-//     'mkdru_block_facet' => array(
-//       'template' => 'mkdru-block-facet',
-//       'arguments' => array('divId' => NULL),
-//     ),
+    'mkdru_block_facet' => array(
+      'template' => 'mkdru-block-facet',
+      'arguments' => array('class' => NULL)
+    )
   );
 }
 
@@ -295,13 +295,28 @@ function mkdru_block($op='list', $delta='sources', $edit=array()) {
   switch ($op) {
     case 'list':
       // facet blocks
+      // D6 has no setting for note type visibility, set
+      // the default to limit facet display to this type
+      $visPHP = '<?php
+  if (arg(0) == "node" && is_numeric(arg(1))) {
+    $node = node_load(array("nid" => arg(1)));
+    return $node->type == "mkdru";
+  }
+?>';
+
       // NB: block caching is redundant for static content
       $blocks['mkdru_sources']['info'] = t('mkdru - source facets');
       $blocks['mkdru_sources']['cache'] = BLOCK_NO_CACHE;
+      $blocks['mkdru_sources']['visibility'] = 2;
+      $blocks['mkdru_sources']['pages'] = $visPHP;
       $blocks['mkdru_subjects']['info'] = t('mkdru - subject facets');
       $blocks['mkdru_subjects']['cache'] = BLOCK_NO_CACHE;
+      $blocks['mkdru_subjects']['visibility'] = 2;
+      $blocks['mkdru_subjects']['pages'] = $visPHP;
       $blocks['mkdru_authors']['info'] = t('mkdru - author facets');
       $blocks['mkdru_authors']['cache'] = BLOCK_NO_CACHE;
+      $blocks['mkdru_authors']['visibility'] = 2;
+      $blocks['mkdru_authors']['pages'] = $visPHP;
       // search blocks
       $result = db_query("SELECT title, nid FROM {node} WHERE type = 'mkdru';");
       while ($node = db_fetch_object($result)) {
@@ -313,30 +328,17 @@ function mkdru_block($op='list', $delta='sources', $edit=array()) {
 
     case 'view':
       switch ($delta) {
-        // TODO: make the facet themable, I have no clue why this won't work
-//         case 'mkdru_sources':
-//           $block['subject'] = t('Source');
-//           $block['content'] = theme('mkdru_block_facet', 'mkdru-sources');
-//           return $block;
-//         case 'mkdru_subjects':
-//           $block['subject'] = t('Subject');
-//           $block['content'] = theme('mkdru_block_facet', 'mkdru-subjects');
-//           return $block;
-//         case 'mkdru_authors':
-//           $block['subject'] = t('Author');
-//           $block['content'] = theme('mkdru_block_facet', 'mkdru-authors');
-//           return $block;
         case 'mkdru_sources':
           $block['subject'] = t('Source');
-          $block['content'] = '<div class="mkdru-facet mkdru-facet-sources"> </div>';
+          $block['content'] = theme('mkdru_block_facet', 'mkdru-facet-source');
           return $block;
         case 'mkdru_subjects':
           $block['subject'] = t('Subject');
-          $block['content'] = '<div class="mkdru-facet mkdru-facet-subjects"> </div>';
+          $block['content'] = theme('mkdru_block_facet', 'mkdru-facet-subject');
           return $block;
         case 'mkdru_authors':
           $block['subject'] = t('Author');
-          $block['content'] = '<div class="mkdru-facet mkdru-facet-authors"> </div>';
+          $block['content'] = theme('mkdru_block_facet', 'mkdru-facet-author');
           return $block;
     }
     if (substr($delta, 0, 13) == 'mkdru_search_') {