corrected footer call

addressbook/preferences.php

@@ -101,5 +101,5 @@
    </table>
   </form>
 <?php
-  include($phpgw_info["server"]["api_inc"] . "/footer.inc.php");
+  $phpgw->common->phpgw_footer();
 ?>

admin/navbar-create.php

@@ -28,5 +28,5 @@ The instructions are as follows:
     echo $phpgw_info["apps"][$key]["title"]."</A><BR>";
   }
 
-  include($phpgw_info["server"]["api_inc"] . "/footer.inc.php");
+  $phpgw->common->phpgw_footer();
 ?>

calendar/inc/functions.inc.php

@@ -1052,9 +1052,12 @@
 		$days = array(0 => "Sunday", 1 => "Monday", 2 => "Tuesday", 3 => "Wednesday", 4 => "Thursday", 5 => "Friday", 6 => "Saturday");
       }
 	  $p = new Template($phpgw->common->get_tpl_dir('calendar'));
-      $p->set_file(array('mini_cal' => 'mini_cal.tpl'));
-      $p->set_block('mini_cal',"month_week");
-      $p->set_block('mini_cal','day');
+      $p->set_file(array('mini_cal' => 'mini_cal.tpl',
+      					 'mini_day' => 'mini_day.tpl',
+      					 'mini_week' => 'mini_week.tpl'));
+      $p->set_block('mini_cal','mini_week','mini_day');
+//      $p->set_block('mini_cal',"mini_week");
+//      $p->set_block('mini_cal','mini_day');
       $p->set_var('bgcolor',$phpgw_info["theme"]["bg_text"]);
       $p->set_var('bgcolor1',$phpgw_info["theme"]["bg_color"]);
       $p->set_var('month',lang($phpgw->common->show_date($date["raw"],"F")).' '.$year);
@@ -1064,7 +1067,7 @@
       $p->set_var('bgcolor2',$phpgw_info["theme"]["cal_dayview"]);
       for($i=0;$i<7;$i++) {
 		$p->set_var('dayname',substr(lang($days[$i]),0,2));
-		$p->parse('daynames','day',True);
+		$p->parse('daynames','mini_day',True);
       }
       for($i=$weekstarttime;date("Ymd",$i)<=$monthend;$i += (24 * 3600 * 7)) {
 		for($j=0;$j<7;$j++) {
@@ -1086,13 +1089,13 @@
 	    	$p->set_var('bgcolor2','#FEFEFE');
 	    	$p->set_var('dayname',$cal["day"]);
 	  	  }
-	  	  $p->parse('monthweek_day','day',True);
+	  	  $p->parse('monthweek_day','mini_day',True);
 		}
-		$p->parse('display_monthweek','month_week',True);
+		$p->parse('display_monthweek','mini_week',True);
 		$p->set_var('dayname','');
 		$p->set_var('monthweek_day','');
       }
-      $p->pparse('out','mini_cal');
+      return $p->parse('out','mini_cal');
     }
 
     function html_for_event_day_at_a_glance ($event) {

calendar/inc/hook_home.inc.php

@@ -11,13 +11,13 @@
   if ($phpgw_info["user"]["preferences"]["calendar"]["mainscreen_showevents"]) {
     include($phpgw_info["server"]["app_inc"] . "/functions.inc.php");
     echo "<!-- Calendar info -->\n";
+    echo $phpgw->calendar->mini_calendar($phpgw->calendar->today["day"],$phpgw->calendar->today["month"],$phpgw->calendar->today["year"]);
     $now = $phpgw->calendar->splitdate(mktime (0, 0, 0, $phpgw->calendar->today["month"], $phpgw->calendar->today["day"], $phpgw->calendar->today["year"]) - ((60 * 60) * $phpgw_info["user"]["preferences"]["common"]["tz_offset"]));
     echo "<table border=\"0\" width=\"70%\" cellspacing=\"0\" cellpadding=\"0\"><tr><td align=\"center\">"
 	. lang(date("F",$phpgw->calendar->today["raw"])) . " " .$phpgw->calendar->today["day"] . ", " . $phpgw->calendar->today["year"] ."</tr></td>"
         . "<tr><td bgcolor=\"".$phpgw_info["theme"]["bg_text"]."\" valign=\"top\">"
 	. $phpgw->calendar->print_day_at_a_glance($now)."</td></tr></table>\n";
     echo "<!-- Calendar info -->\n";
-    $phpgw->calendar->mini_calendar($phpgw->calendar->today["day"],$phpgw->calendar->today["month"],$phpgw->calendar->today["year"]);
     unset($phpgw->calendar);
   } 
 

calendar/index.php

@@ -70,12 +70,12 @@
 
   $phpgw->template->set_var("bg_text",$phpgw_info["theme"]["bg_text"]);
 
-  $phpgw->template->set_var("small_calendar_prev",$phpgw->calendar->pretty_small_calendar($thisday,$prev["month"],$prev["year"],"day.php"));
+  $phpgw->template->set_var("small_calendar_prev",$phpgw->calendar->mini_calendar($thisday,$prev["month"],$prev["year"],"day.php"));
 
   $m = mktime(2,0,0,$thismonth,1,$thisyear);
   $phpgw->template->set_var("month_identifier",lang(strftime("%B",$m)) . " " . $thisyear);
   $phpgw->template->set_var("username",$phpgw->common->grab_owner_name($owner));
-  $phpgw->template->set_var("small_calendar_next",$phpgw->calendar->pretty_small_calendar($thisday,$next["month"],$next["year"],"day.php"));
+  $phpgw->template->set_var("small_calendar_next",$phpgw->calendar->mini_calendar($thisday,$next["month"],$next["year"],"day.php"));
   $phpgw->template->set_var("large_month",$phpgw->calendar->display_large_month($thismonth,$thisyear,True,$owner));
   if (!$friendly) {
     $param = "year=".$now["year"]."&month=".$now["month"]."&friendly=1&filter=".$filter;

calendar/preferences.php

@@ -149,4 +149,4 @@
  </table>
 </form>
 
-<?php include($phpgw_info["server"]["api_inc"] . "/footer.inc.php"); ?>
+<?php $phpgw->common->phpgw_footer(); ?>

calendar/templates/verdilak/mini_cal.tpl

@@ -1,3 +1,5 @@
+<!-- $Id$ -->
+<!-- BEGIN mini_cal -->
 <table border="0" cellspacing="0" cellpadding="0" valign="top" bgcolor="{bgcolor}" cols="7">
  <tr valign="center" bgcolor="{bgcolor1}" bordercolor="{bgcolor1}">
   <td align="left" colspan="4"><font size="-2">{month}</font></td>
@@ -6,21 +8,11 @@
  <tr valign="top">
   <td bgcolor="{bgcolor}" colspan="7">
    <table border="0" width="100%" cellspacing="1" cellpadding="2" valign="top" cols="7">
-    <tr>
-     {daynames}
-    </tr>
-    {display_monthweek}
+    <tr>{daynames}
+    </tr>{display_monthweek}
    </table>
   </td>
  </tr>
 </table>
+<!-- END mini_cal -->
 
-<!-- BEGIN day -->
-     <td bgcolor="{bgcolor2}" align="center"><font size="-2"><b>{dayname}</b></font></td>
-<!-- END day -->
-
-<!-- BEGIN month_week -->
-    <tr>
-     {monthweek_day}
-    </tr>
-<!-- END month_week -->

calendar/templates/verdilak/mini_day.tpl

@@ -0,0 +1,4 @@
+<!-- $Id$ -->
+<!-- BEGIN mini_day -->
+     <td bgcolor="{bgcolor2}" align="center"><font size="-2"><b>{dayname}</b></font></td>
+<!-- END mini_day -->

calendar/templates/verdilak/mini_week.tpl

@@ -0,0 +1,5 @@
+<!-- $Id$ -->
+<!-- BEGIN mini_week -->
+    <tr>{monthweek_day}
+    </tr>
+<!-- END mini_week -->