- Timestamp:
- Jun 27, 2013, 10:45:32 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/calendar_base.class.php
r19703 r23618 295 295 if ( !isset($upper_items_rank[$current]) ) 296 296 { 297 array_push($upper_items, $current);// just in case (external link)297 $upper_items[] = $current;// just in case (external link) 298 298 usort($upper_items, 'version_compare'); 299 299 $upper_items_rank = array_flip($upper_items); … … 331 331 if ( !empty($tpl_var) ) 332 332 { 333 $existing = & $template->get_template_vars('chronology_navigation_bars');334 if ( !empty($existing))335 { 336 $existing [ sizeof($existing)-1 ] =337 array_merge( $existing [ sizeof($existing)-1 ], $tpl_var);333 $existing = $template->smarty->getVariable('chronology_navigation_bars'); 334 if (! ($existing instanceof Undefined_Smarty_Variable)) 335 { 336 $existing->value[ sizeof($existing->value)-1 ] = 337 array_merge( $existing->value[ sizeof($existing->value)-1 ], $tpl_var); 338 338 } 339 339 else -
trunk/themes/default/template/month_calendar.tpl
r23476 r23618 1 2 1 {if !empty($chronology_navigation_bars) } 3 2 {foreach from=$chronology_navigation_bars item=bar} … … 13 12 {else} 14 13 {foreach from=$bar.items item=item} 15 <span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$item.NB_IMAGES|@translate_dec:'%d photo':'%d photos'}"{/if}>14 <span class="calItem{if !isset($item.URL)}Empty{/if}"{if isset($item.NB_IMAGES)} title="{$item.NB_IMAGES|@translate_dec:'%d photo':'%d photos'}"{/if}> 16 15 {if isset($item.URL)} 17 16 <a href="{$item.URL}">{$item.LABEL}</a> … … 53 52 </tr> 54 53 </thead> 55 {html_head} {*add the style to html head for strict standard compliance*} 56 <style type="text/css"> 57 TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim} 58 width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px; 54 {html_style} 55 TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg{ 56 width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px 59 57 } 60 </style> 61 {/html_head} 58 {/html_style} 62 59 {foreach from=$chronology_calendar.month_view.weeks item=week} 63 60 <tr> … … 69 66 <div class="calImg"> 70 67 <a href="{$day.U_IMG_LINK}"> 71 68 <img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$day.NB_ELEMENTS|@translate_dec:'%d photo':'%d photos'}"> 72 69 </a> 73 70 </div> … … 79 76 {/if} 80 77 </td> 81 {/foreach} 78 {/foreach}{*day in week*} 82 79 </tr> 83 {/foreach} 80 {/foreach}{*week in month*} 84 81 </table> 85 82 {/if}
Note: See TracChangeset
for help on using the changeset viewer.