adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@1352 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2006-06-14 00:39:45 +00:00
parent 4a5f6b8999
commit 4dbad1bd72
2 changed files with 4 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/calendar_monthly.class.php
+1 -1
View File
@@ -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());
}
template/yoga/month_calendar.tpl
+3 -16
View File
@@ -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}">