bug 388: html errors in month_calendar
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1351 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
parent
6bca249303
commit
c555bfb2ae
2 changed files with 4 additions and 17 deletions
|
@ -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());
|
||||
}
|
||||
|
|
|
@ -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}">
|
||||
|
|
Loading…
Add table
Reference in a new issue