Changeset 1352


Ignore:
Timestamp:
Jun 14, 2006, 2:39:45 AM (18 years ago)
Author:
rvelices
Message:

merge r1351 from branch-1_6 to trunk (bug 388: html errors in month_calendar)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/calendar_monthly.class.php

    r1109 r1352  
    427427    {
    428428      $dow = ($first_day_dow + $day-1)%7;
    429       if ($dow==0)
     429      if ($dow==0 and $day!=1)
    430430      {
    431431        $template->assign_block_vars('calendar.thumbnails.row', array());
  • trunk/template/yoga/month_calendar.tpl

    r1292 r1352  
    22<!-- $Id$ -->
    33<!-- BEGIN thumbnails -->
    4 <style type="text/css">
    5 <!--
    6 TD.calDayCellFull, TD.calDayCellEmpty, TD.calDayCellBlank
    7 {
    8   width: {calendar.thumbnails.WIDTH}px;
    9   height: {calendar.thumbnails.HEIGHT}px;
    10 }
    11 DIV.calImg
    12 {
    13   width: {calendar.thumbnails.WIDTH}px;
    14   height: {calendar.thumbnails.HEIGHT}px;
    15 }
    16 //--></style>
    174<table class="calMonth">
    185<!-- BEGIN head -->
     
    2714 <!-- BEGIN col -->
    2815 <!-- BEGIN blank -->
    29  <td class="calDayCellBlank">
     16 <td class="calDayCellBlank" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;">
    3017 <!-- END blank -->
    3118 <!-- BEGIN empty -->
    32  <td class="calDayCellEmpty">{calendar.thumbnails.row.col.empty.LABEL}
     19 <td class="calDayCellEmpty" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;">{calendar.thumbnails.row.col.empty.LABEL}
    3320 <!-- END empty -->
    3421 <!-- BEGIN full -->
    3522 <td class="calDayCellFull"><div class="calBackDate">{calendar.thumbnails.row.col.full.LABEL}</div><div class="calForeDate">{calendar.thumbnails.row.col.full.LABEL}</div>
    36         <div class="calImg"><a href="{calendar.thumbnails.row.col.full.U_IMG_LINK}">
     23        <div class="calImg" style="width:{calendar.thumbnails.WIDTH}px;height:{calendar.thumbnails.HEIGHT}px;"><a href="{calendar.thumbnails.row.col.full.U_IMG_LINK}">
    3724          <img style="{calendar.thumbnails.row.col.full.STYLE}" {calendar.thumbnails.row.col.full.IMG_WIDTH} {calendar.thumbnails.row.col.full.IMG_HEIGHT}
    3825               src="{calendar.thumbnails.row.col.full.IMAGE}" alt="{calendar.thumbnails.row.col.full.IMAGE_ALT}"
Note: See TracChangeset for help on using the changeset viewer.