Changeset 1062 for trunk/include/functions_calendar.inc.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/functions_calendar.inc.php (modified) (2 diffs)

trunk/include/functions_calendar.inc.php

@@ -261 +261 @@
       }
     }
+    $calendar_title =
+        '<a href="'.$url_base.$cal_style.'-'.$cal_view.'">'
+        .$fields[$cal_field]['label'].'</a>';
+    $calendar_title.= $calendar->get_display_name();
+    //this should be an assign_block_vars, but I need to assign 'calendar'
+    //above and at that point I don't have the title yet.
+    $template->_tpldata['calendar.'][0]['TITLE'] = $calendar_title;
   } // end category calling
 
-  $calendar_title =
-      '<a href="'.$url_base.$cal_style.'-'.$cal_view.'">'
-      .$fields[$cal_field]['label'].'</a>';
-  $calendar_title.= $calendar->get_display_name();
-  $template->assign_block_vars(
-    'calendar',
-    array(
-      'TITLE' => '<br/>'.$calendar_title,
-      )
-    );
-
   if ($must_show_list)
   {
     $query = 'SELECT DISTINCT(id)';
-    $query .= $calendar->inner_sql;
-    $query .= $calendar->get_date_where();
+    $query .= $calendar->inner_sql.'
+  '.$calendar->get_date_where();
     if ( isset($page['super_order_by']) )
     {
@@ -290 +286 @@
         'ORDER BY '.$calendar->date_field.' DESC,', $conf['order_by']
         );
-      $query .= $order_by;
+      $query .= '
+  '.$order_by;
     }