Changeset 1597
- Timestamp:
- Nov 8, 2006, 4:01:28 AM (17 years ago)
- Location:
- trunk/include
- Files:
-
- 1 added
- 2 deleted
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/calendar_monthly.class.php
-
Property
svn:keywords
set to
Author Date Id Revision
r1558 r1597 4 4 // | Copyright (C) 2003-2006 PhpWebGallery Team - http://phpwebgallery.net | 5 5 // +-----------------------------------------------------------------------+ 6 // | branch : BSF (Best So Far) 7 // | file : $RCSfile$ 8 // | last update : $Date: 2006-01-27 02:11:43 +0100 (ven, 27 jan 2006) $ 9 // | last modifier : $Author: rvelices $ 10 // | revision : $Revision: 1014 $ 6 // | file : $Id$ 7 // | last update : $Date$ 8 // | last modifier : $Author$ 9 // | revision : $Revision$ 11 10 // +-----------------------------------------------------------------------+ 12 11 // | This program is free software; you can redistribute it and/or modify | … … 342 341 $page['chronology_date'][CDAY]=$day; 343 342 $query = ' 344 SELECT file,tn_ext,path, width, height, DAYOFWEEK('.$this->date_field.')-1 as dow';343 SELECT id, file,tn_ext,path, width, height, DAYOFWEEK('.$this->date_field.')-1 as dow'; 345 344 $query.= $this->inner_sql; 346 345 $query.= $this->get_date_where(); … … 350 349 unset ( $page['chronology_date'][CDAY] ); 351 350 352 $row = mysql_fetch_a rray(pwg_query($query));353 $items[$day]['tn_ path'] = get_thumbnail_src($row['path'], @$row['tn_ext']);351 $row = mysql_fetch_assoc(pwg_query($query)); 352 $items[$day]['tn_url'] = get_thumbnail_url($row); 354 353 $items[$day]['file'] = $row['file']; 355 354 $items[$day]['path'] = $row['path']; … … 449 448 else 450 449 {// item not an image (tn is either mime type or an image) 451 $thumb = get_thumbnail_src( 452 $items[$day]['path'], @$items[$day]['tn_ext'], false 453 ); 450 $thumb = get_thumbnail_path($items[$day]); 454 451 $tn_size = @getimagesize($thumb); 455 452 } … … 508 505 ); 509 506 $alt = $wday_labels[$dow] . ' ' . $day. 510 ' ('. $items[$day]['nb_images'].')';507 ' ('.sprintf("%d ".l10n('pictures'), $items[$day]['nb_images']).')'; 511 508 $template->assign_block_vars('calendar.thumbnails.row.col.full', 512 509 array( 513 510 'LABEL' => $day, 514 'IMAGE' => $items[$day]['tn_ path'],511 'IMAGE' => $items[$day]['tn_url'], 515 512 'U_IMG_LINK'=> $url, 516 513 'STYLE' => $css_style, … … 554 551 'thumbnails.line.thumbnail', 555 552 array( 556 'IMAGE'=>$data['tn_ path'],553 'IMAGE'=>$data['tn_url'], 557 554 'IMAGE_ALT'=>$data['file'], 558 555 'IMAGE_TITLE'=>$thumbnail_title, -
Property
svn:keywords
set to
-
trunk/include/section_init.inc.php
r1537 r1597 360 360 $result['nb_images'] > 0 361 361 ? 'include/category_default.inc.php' 362 : 'include/category_ subcats.inc.php';362 : 'include/category_cats.inc.php'; 363 363 } //otherwise the calendar will requery all subitems 364 364 } … … 366 366 { 367 367 $page['title'] = $lang['no_category']; 368 $page['thumbnails_include'] = 'include/category_ subcats.inc.php';368 $page['thumbnails_include'] = 'include/category_cats.inc.php'; 369 369 } 370 370 } … … 535 535 array( 536 536 'title' => $lang['recent_cats_cat'], 537 'thumbnails_include' => 'include/category_ recent_cats.inc.php',537 'thumbnails_include' => 'include/category_cats.inc.php', 538 538 ) 539 539 );
Note: See TracChangeset
for help on using the changeset viewer.