Changeset 12851

Timestamp:

10/17/07 14:12:03 (1 year ago)

Author:

bergie

Message:

More navigation display options

Files:

• trunk/midcom/net.nemein.calendar/config/config.inc (modified) (1 diff)
• trunk/midcom/net.nemein.calendar/handler/list.php (modified) (2 diffs)
• trunk/midcom/net.nemein.calendar/navigation.php (modified) (4 diffs)

trunk/midcom/net.nemein.calendar/config/config.inc

@@ -16 +16 @@
-'archive_enable' => true,
-'archive_year_order'   => 'ASC',  // Order for years in archive welcome page
+'archive_in_navigation' => false,
+'archive_years_in_navigation' => true,
-
-'show_navigation_pseudo_leaves' => true,   // Set this to false if you want to hide archive navigation items
-
-'categories' => '',
+'categories_in_navigation' => false,
-
-'rss_subscription_enable' => false,

trunk/midcom/net.nemein.calendar/handler/list.php

@@ -207 +207 @@
-    {
-        $this->_load_datamanager();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        // Get the requested date range
-        // TODO: Check format as YYYY-MM-DD via regexp
@@ -232 +218 @@
-            return false;
-        }
+        
+        if ($handler_id == 'archive-between')
+        {
+            if (!$this->_config->get('archive_enable'))
+            {
+                return false;
+            }        
+            $this->_request_data['archive_mode'] = true;
+            
+            if ($this->_config->get('archive_in_navigation'))
+            {
+                $this->_component_data['active_leaf'] = "{$data['content_topic']->id}_ARCHIVE";
+            }
+            else
+            {
+                $this->_component_data['active_leaf'] = "{$data['content_topic']->id}_ARCHIVE_" . date('Y', $start);
+            }
+        }
+        else
+        {
+            $this->_request_data['archive_mode'] = false;            
+        }
+        
+
-
-        $this->_request_data['start'] = $start;

trunk/midcom/net.nemein.calendar/navigation.php

@@ -17 +17 @@
-{
-    /**
+     * The topic in which to look for articles. This defaults to the current content topic
+     * unless overridden by the symlink topic feature.
+     *
+     * @var midcom_db_topic
+     * @access private
+     */
+    var $_content_topic = null;
+    
+    /**
-     * Simple constructor, calls base class.
-     */
@@ -32 +41 @@
-        
-        if (   $this->_config->get('archive_enable')
+            && $this->_config->get('archive_in_navigation')
-            && $this->_config->get('show_navigation_pseudo_leaves'))
-        {
@@ -50 +60 @@
-        
-        if (   $this->_config->get('show_navigation_pseudo_leaves')
+            && $this->_config->get('categories_in_navigation')
-            && $this->_config->get('categories') != '')
-        {
@@ -71 +82 @@
-        }
-        
+        if (   $this->_config->get('show_navigation_pseudo_leaves')
+            && $this->_config->get('archive_years_in_navigation'))
+        {
+            // Check for symlink
+            if (!$this->_content_topic)
+            {
+                $this->_determine_content_topic();
+            }
+
+            $qb = net_nemein_calendar_event_dba::new_query_builder();    
+            $qb->add_constraint('node', '=', $this->_content_topic->id);
+            $qb->add_order('start');
+            $qb->set_limit(1);
+            $result = $qb->execute_unchecked();
+            $first_year = (int) date('Y', strtotime($result[0]->start));
+            $year = $first_year;
+            $this_year = (int) date('Y', time());
+            while ($year <= $this_year)
+            {
+                $next_year = $year + 1;
+                $leaves["{$this->_topic->id}_ARCHIVE_{$year}"] = array
+                (
+                    MIDCOM_NAV_SITE => Array
+                    (
+                        MIDCOM_NAV_URL => "archive/between/{$year}-01-01/{$next_year}-01-01/",
+                        MIDCOM_NAV_NAME => $year,
+                    ),
+                    MIDCOM_NAV_ADMIN => null,
+                    MIDCOM_META_CREATOR => $this->_topic->metadata->creator,
+                    MIDCOM_META_EDITOR => $this->_topic->metadata->revisor,
+                    MIDCOM_META_CREATED => $this->_topic->metadata->created,
+                    MIDCOM_META_EDITED => $this->_topic->metadata->revised,
+                );
+                $year = $next_year;
+            }
+        }
+        
-        return $leaves;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-?>