From 4dbad1bd7292465c6c56ed7a03a28d3a28d08367 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Wed, 14 Jun 2006 00:39:45 +0000
Subject: [PATCH] merge r1351 from branch-1_6 to trunk (bug 388: html errors in
 month_calendar)

git-svn-id: http://piwigo.org/svn/trunk@1352 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 include/calendar_monthly.class.php |  2 +-
 template/yoga/month_calendar.tpl   | 19 +++----------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/include/calendar_monthly.class.php b/include/calendar_monthly.class.php
index 5c55dbe5d..214d77cd8 100644
--- a/include/calendar_monthly.class.php
+++ b/include/calendar_monthly.class.php
@@ -426,7 +426,7 @@ SELECT file,tn_ext,path, width, height, DAYOFWEEK('.$this->date_field.')-1 as do
           $day++)
     {
       $dow = ($first_day_dow + $day-1)%7;
-      if ($dow==0)
+      if ($dow==0 and $day!=1)
       {
         $template->assign_block_vars('calendar.thumbnails.row', array());
       }
diff --git a/template/yoga/month_calendar.tpl b/template/yoga/month_calendar.tpl
index 351ede151..7e531e7c7 100644
--- a/template/yoga/month_calendar.tpl
+++ b/template/yoga/month_calendar.tpl
@@ -1,19 +1,6 @@
 <!-- BEGIN calendar -->
 <!-- $Id$ -->
 <!-- BEGIN thumbnails -->
-<style type="text/css">
-<!--
-TD.calDayCellFull, TD.calDayCellEmpty, TD.calDayCellBlank
-{
-  width: {calendar.thumbnails.WIDTH}px;
-  height: {calendar.thumbnails.HEIGHT}px;
-}
-DIV.calImg
-{
-  width: {calendar.thumbnails.WIDTH}px;
-  height: {calendar.thumbnails.HEIGHT}px;
-}
-//--></style>
 <table class="calMonth">
 <!-- BEGIN head -->
  <thead><tr>
@@ -26,14 +13,14 @@ DIV.calImg
  <tr>
  <!-- BEGIN col -->
  <!-- BEGIN blank -->
- <td class="calDayCellBlank">
+ <td class="calDayCellBlank" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;">
  <!-- END blank -->
  <!-- BEGIN empty -->
- <td class="calDayCellEmpty">{calendar.thumbnails.row.col.empty.LABEL}
+ <td class="calDayCellEmpty" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;">{calendar.thumbnails.row.col.empty.LABEL}
  <!-- END empty -->
  <!-- BEGIN full -->
  <td class="calDayCellFull"><div class="calBackDate">{calendar.thumbnails.row.col.full.LABEL}</div><div class="calForeDate">{calendar.thumbnails.row.col.full.LABEL}</div>
-	<div class="calImg"><a href="{calendar.thumbnails.row.col.full.U_IMG_LINK}">
+	<div class="calImg" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;"><a href="{calendar.thumbnails.row.col.full.U_IMG_LINK}">
 	  <img style="{calendar.thumbnails.row.col.full.STYLE}" {calendar.thumbnails.row.col.full.IMG_WIDTH} {calendar.thumbnails.row.col.full.IMG_HEIGHT}
 	       src="{calendar.thumbnails.row.col.full.IMAGE}" alt="{calendar.thumbnails.row.col.full.IMAGE_ALT}"
 	    title="{calendar.thumbnails.row.col.full.IMAGE_ALT}">