Changeset 23618 for trunk

Timestamp:

Jun 27, 2013, 10:45:32 PM (11 years ago)

Author:

rvelices

Message:

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

Location:

trunk

Files:

• include/calendar_base.class.php (modified) (2 diffs)
• themes/default/template/month_calendar.tpl (modified) (5 diffs)

trunk/include/calendar_base.class.php

@@ -295 +295 @@
     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);
@@ -331 +331 @@
     if ( !empty($tpl_var) )
     {
-      $existing = & $template->get_template_vars('chronology_navigation_bars');
-      if ( !empty($existing) )
-      {
-        $existing[ sizeof($existing)-1 ] =
-          array_merge( $existing[ sizeof($existing)-1 ], $tpl_var);
+      $existing = $template->smarty->getVariable('chronology_navigation_bars');
+      if (! ($existing instanceof Undefined_Smarty_Variable))
+      {
+        $existing->value[ sizeof($existing->value)-1 ] =
+          array_merge( $existing->value[ sizeof($existing->value)-1 ], $tpl_var);
       }
       else

trunk/themes/default/template/month_calendar.tpl

@@ -1 @@
-
 {if !empty($chronology_navigation_bars) }
 {foreach from=$chronology_navigation_bars item=bar}
@@ -13 +12 @@
         {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>
@@ -53 +52 @@
  </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>
@@ -69 +66 @@
                                 <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>
@@ -79 +76 @@
         {/if}
         </td>
-        {/foreach} {*day in week*}
+        {/foreach}{*day in week*}
  </tr>
- {/foreach}  {*week in month*}
+ {/foreach}{*week in month*}
 </table>
 {/if}