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

fix missing prev/next nav items in the calendar view (Smarty get_template_vars by reference not working anymore)

Browse Source 
git-svn-id: http://piwigo.org/svn/trunk@23618 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2013-06-27 20:45:32 +00:00
parent c41ff2e14e
commit 56b3516bae
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/calendar_base.class.php
+5 -5
View File
@@ -294,7 +294,7 @@ GROUP BY period';
$upper_items_rank = array_flip($upper_items);
if ( !isset($upper_items_rank[$current]) )
{
array_push($upper_items, $current);// just in case (external link)
$upper_items[] = $current;// just in case (external link)
usort($upper_items, 'version_compare');
$upper_items_rank = array_flip($upper_items);
}
@@ -330,11 +330,11 @@ GROUP BY period';
if ( !empty($tpl_var) )
{
$existing = & $template->get_template_vars('chronology_navigation_bars');
if ( !empty($existing) )
$existing = $template->smarty->getVariable('chronology_navigation_bars');
if (! ($existing instanceof Undefined_Smarty_Variable))
{
$existing[ sizeof($existing)-1 ] =
array_merge( $existing[ sizeof($existing)-1 ], $tpl_var);
$existing->value[ sizeof($existing->value)-1 ] =
array_merge( $existing->value[ sizeof($existing->value)-1 ], $tpl_var);
}
else
{
themes/default/template/month_calendar.tpl
+8 -11
View File
@@ -1,4 +1,3 @@
{if !empty($chronology_navigation_bars) }
{foreach from=$chronology_navigation_bars item=bar}
<div class="calendarBar">
@@ -12,7 +11,7 @@
&nbsp;
{else}
{foreach from=$bar.items item=item}
<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}>
<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}>
{if isset($item.URL)}
<a href="{$item.URL}">{$item.LABEL}</a>
{else}
@@ -52,13 +51,11 @@
{/foreach}
</tr>
</thead>
{html_head} {*add the style to html head for strict standard compliance*}
<style type="text/css">
TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px;
{html_style}
TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg{
width:{$chronology_calendar.month_view.CELL_WIDTH}px;height:{$chronology_calendar.month_view.CELL_HEIGHT}px
}
</style>
{/html_head}
{/html_style}
{foreach from=$chronology_calendar.month_view.weeks item=week}
<tr>
{foreach from=$week item=day}
@@ -68,7 +65,7 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
<div class="calBackDate">{$day.DAY}</div><div class="calForeDate">{$day.DAY}</div>
<div class="calImg">
<a href="{$day.U_IMG_LINK}">
<img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$day.NB_ELEMENTS|@translate_dec:'%d photo':'%d photos'}">
<img style="{$day.IMAGE_STYLE}" src="{$day.IMAGE}" alt="{$day.IMAGE_ALT}" title="{$day.NB_ELEMENTS|@translate_dec:'%d photo':'%d photos'}">
</a>
</div>
{else}
@@ -78,9 +75,9 @@ TABLE.calMonth TBODY TD, TABLE.calMonth TBODY TD DIV.calImg {ldelim}
<td>
{/if}
</td>
{/foreach} {*day in week*}
{/foreach}{*day in week*}
</tr>
{/foreach} {*week in month*}
{/foreach}{*week in month*}
</table>
{/if}