Changeset 1062 for trunk/include/calendar_monthly.class.php

Timestamp:

Mar 3, 2006, 2:57:39 AM (18 years ago)

Author:

rvelices

Message:

improvement: calendar navigation now uses at maximum one navigation bar
together with a next/previous date links

improvement: calendar view styles now shown in DIV.titrePage (I still need
to move padding from H2 to DIV.titrePage ...)

fix: moved all calendar css colors from template to the theme

File:

• trunk/include/calendar_monthly.class.php (modified) (2 diffs)

trunk/include/calendar_monthly.class.php

@@ -94 +94 @@
     {//case C: year+month given - display a nice month calendar
       $this->build_month_calendar();
+      //$this->build_nav_bar(CYEAR); // years
+      //$this->build_nav_bar(CMONTH); // month
+      $this->build_next_prev();
+      return true;
+    }
+  }
+
+  if ($view_type==CAL_VIEW_LIST or count($this->date_components)==3)
+  {
+    $has_nav_bar = false;
+    if ( count($this->date_components)==0 )
+    {
       $this->build_nav_bar(CYEAR); // years
+    }
+    if ( count($this->date_components)==1)
+    {
       $this->build_nav_bar(CMONTH); // month
-      return true;
-    }
-  }
-
-  if ($view_type==CAL_VIEW_LIST or count($this->date_components)==3)
-  {
-    if ( count($this->date_components)>=0 )
-    {
-      $this->build_nav_bar(CYEAR); // years
-    }
-    if ( count($this->date_components)>=1)
-    {
-      $this->build_nav_bar(CMONTH); // month
-    }
-    if ( count($this->date_components)>=2 )
-    {
-      $this->build_nav_bar(
-          CDAY,
-          range( 1, $this->get_all_days_in_month(
-              $this->date_components[CYEAR] ,$this->date_components[CMONTH] )
-              )
-        ); // days
-    }
+    }
+    if ( count($this->date_components)==2 )
+    {
+      $day_labels = range( 1, $this->get_all_days_in_month(
+              $this->date_components[CYEAR] ,$this->date_components[CMONTH] ) );
+      array_unshift($day_labels, 0);
+      unset( $day_labels[0] );
+      $this->build_nav_bar( CDAY, $day_labels ); // days
+    }
+    $this->build_next_prev();
   }
   return false;
@@ -294 +296 @@
     list($m) = array_keys($items);
     $this->date_components[CMONTH] = $m;
-    if (count($items[$m]['children'])==1)
-    { // or even to day view if everything occured in one day
-      list($d) = array_keys($items[$m]['children']);
-      $this->date_components[CDAY] = $d;
-    }
     return false;
   }