Changeset 3168 for trunk

Timestamp:

Mar 3, 2009, 3:05:35 AM (15 years ago)

Author:

rvelices

Message:

• improvement: show the number of images in the chronology upper navigation bar on mouseover (title element);

Location:

trunk

Files:

• include/calendar_base.class.php (modified) (11 diffs)
• include/calendar_monthly.class.php (modified) (4 diffs)
• template/yoga/calendar_navbar.tpl (deleted)
• template/yoga/month_calendar.tpl (modified) (2 diffs)

trunk/include/calendar_base.class.php

@@ -128 +128 @@
    * @param array date_components
    * @param array items - hash of items to put in the bar (e.g. 2005,2006)
-   * @param string class_prefix - html class attribute prefix for span elements
    * @param bool show_any - adds any link to the end of the bar
    * @param bool show_empty - shows all labels even those without items
@@ -135 +134 @@
    */
   function get_nav_bar_from_items($date_components, $items,
-                                  $class_prefix, $show_any,
+                                  $show_any,
                                   $show_empty=false, $labels=null)
   {
@@ -164 +163 @@
       {
         $tmp_datas=array(
-          'classname' => $class_prefix."Empty",
-          'label'=> $label
+          'LABEL'=> $label
         );
       }
@@ -175 +173 @@
             );
         $tmp_datas=array(
-          'classname' => $class_prefix,
-          'label'=> $label,
-          'url' => $url
+          'LABEL'=> $label,
+          'URL' => $url
         );
       }
       if ($nb_images > 0)
       {
-        $tmp_datas['nb_images']=$nb_images;
+        $tmp_datas['NB_IMAGES']=$nb_images;
       }
       $nav_bar_datas[]=$tmp_datas;
-      
+
     }
 
@@ -196 +193 @@
           );
       $nav_bar_datas[]=array(
-        'label' => l10n('calendar_any'),
-        'classname' => $class_prefix,
-        'url' => $url
+        'LABEL' => l10n('calendar_any'),
+        'URL' => $url
       );
     }
 
-    $template->set_filenames( array( 'nav_bar' => 'calendar_navbar.tpl',));
-    $template->assign('datas', $nav_bar_datas);
-    return($template->parse('nav_bar', true));
+    return $nav_bar_datas;
   }
 
@@ -218 +212 @@
 
     $query = '
-SELECT DISTINCT('.$this->calendar_levels[$level]['sql']
-      .') as period';
-    $query.= $this->inner_sql;
-    $query.= $this->get_date_where($level);
-    $query.= '
+SELECT DISTINCT('.$this->calendar_levels[$level]['sql'].') as period,
+  COUNT(DISTINCT id) as nb_images'.
+$this->inner_sql.
+$this->get_date_where($level).'
   GROUP BY period
 ;';
 
-    $level_items = array();
-    $result = pwg_query($query);
-    while ($row = mysql_fetch_array($result))
-    {
-      $level_items[$row['period']] = 0;
-    }
+    $level_items = simple_hash_from_query($query, 'period', 'nb_images');
 
     if ( count($level_items)==1 and
@@ -258 +246 @@
       $dates,
       $level_items,
-      'calItem',
       true,
       true,
@@ -267 +254 @@
       'chronology_navigation_bars',
       array(
-        'CONTENT' => $nav_bar,
+        'items' => $nav_bar,
         )
       );
@@ -313 +300 @@
 
     $tpl_var = array();
-    
+
     if ( $current_rank>0 )
     { // has previous
@@ -326 +313 @@
         );
     }
-    
+
     if ( $current_rank < count($upper_items)-1 )
     { // has next
@@ -339 +326 @@
         );
     }
-    
+
     if ( !empty($tpl_var) )
     {

trunk/include/calendar_monthly.class.php

@@ -258 +258 @@
 
     $nav_bar = $this->get_nav_bar_from_items( $chronology_date,
-            $year_data['children'], 'calCal', false, false, $lang['month'] );
+            $year_data['children'], false, false, $lang['month'] );
 
     $tpl_var['calendar_bars'][] =
@@ -265 +265 @@
         'NB_IMAGES' => $year_data['nb_images'],
         'HEAD_LABEL' => $year,
-        'NAV_BAR' => $nav_bar,
+        'items' => $nav_bar,
       );
   }
@@ -308 +308 @@
 
     $nav_bar = $this->get_nav_bar_from_items( $chronology_date,
-                     $month_data['children'], 'calCal', false );
+                     $month_data['children'], false );
 
     $tpl_var['calendar_bars'][] =
@@ -315 +315 @@
         'NB_IMAGES' => $month_data['nb_images'],
         'HEAD_LABEL' => $lang['month'][$month],
-        'NAV_BAR' => $nav_bar,
+        'items' => $nav_bar,
       );
   }

trunk/template/yoga/month_calendar.tpl

@@ -4 +4 @@
 {foreach from=$chronology_navigation_bars item=bar}
 <div class="calendarBar">
-  {if isset($bar.previous)}
-    <div style="float:left">&laquo; <a href="{$bar.previous.URL}">{$bar.previous.LABEL}</a></div>
-  {/if}
-  {if isset($bar.next)}
-    <div style="float:right"><a href="{$bar.next.URL}">{$bar.next.LABEL}</a> &raquo;</div>
-  {/if}
-  {if isset($bar.CONTENT)}
-  {$bar.CONTENT}
-  {else}
-  &nbsp;
-  {/if}
+        {if isset($bar.previous)}
+                <div style="float:left">&laquo; <a href="{$bar.previous.URL}">{$bar.previous.LABEL}</a></div>
+        {/if}
+        {if isset($bar.next)}
+                <div style="float:right"><a href="{$bar.next.URL}">{$bar.next.LABEL}</a> &raquo;</div>
+        {/if}
+        {if empty($bar.items)}
+                &nbsp;
+        {else}
+                {foreach from=$bar.items item=item}
+                <span class="calItem{if !isset($item.URL)}Empty{/if}" {if isset($item.NB_IMAGES)}title="{$pwg->l10n_dec('%d element', '%d elements', $item.NB_IMAGES)}"{/if}>
+                {if isset($item.URL)}
+                <a href="{$item.URL}">{$item.LABEL}</a>
+                {else}
+                {$item.LABEL}
+                {/if}
+                </span>
+                {/foreach}
+        {/if}
 </div>
 {/foreach}
@@ -22 +30 @@
 {foreach from=$chronology_calendar.calendar_bars item=bar}
 <div class="calendarCalBar">
-  <span class="calCalHead"><a href="{$bar.U_HEAD}">{$bar.HEAD_LABEL}</a>  ({$bar.NB_IMAGES})</span><br/>
-  {$bar.NAV_BAR}
+        <span class="calCalHead"><a href="{$bar.U_HEAD}">{$bar.HEAD_LABEL}</a>  ({$bar.NB_IMAGES})</span><br/>
+        {foreach from=$bar.items item=item}
+        <span class="calCal{if !isset($item.URL)}Empty{/if}">
+        {if isset($item.URL)}
+        <a href="{$item.URL}">{$item.LABEL}</a>
+        {else}
+        {$item.LABEL}
+        {/if}
+        {if isset($item.NB_IMAGES)}({$item.NB_IMAGES}){/if}
+        </span>
+        {/foreach}
 </div>
 {/foreach}