Changeset 1729

Timestamp:

Jan 18, 2007, 12:06:24 AM (17 years ago)

Author:

plg

Message:

Modification: the history summary graph does not use a true image anymore,
CSS divs are faster and don't require GD library.

Location:

trunk

Files:

• admin/images/phpBarGraph.php (deleted)
• admin/images/stats.img.php (deleted)
• admin/stats.php (modified) (5 diffs)
• template/yoga/admin/default-layout.css (modified) (1 diff)
• template/yoga/admin/stats.tpl (modified) (1 diff)

trunk/admin/stats.php

@@ -318 +318 @@
 }
 
-$url_img = PHPWG_ROOT_PATH.'admin/images/stats.img.php';
-
-if (isset($page['year']))
-{
-  $url_img.= '?year='.$page['year'];
-}
-
-if (isset($page['month']))
-{
-  $url_img.= '&month='.$page['month'];
-}
-
-if (isset($page['day']))
-{
-  $url_img.= '&day='.$page['day'];
-}
-
 $summary_lines = get_summary(
   @$page['year'],
@@ -406 +389 @@
   array(
     'L_STAT_TITLE' => implode($conf['level_separator'], $title_parts),
-    'SRC_REPORT' => $url_img,
     'PERIOD_LABEL' => $period_label,
     )
@@ -415 +397 @@
 // +-----------------------------------------------------------------------+
 
-$i = 1;
-
+$max_width = 400;
+
+$datas = array();
+
+if (isset($page['day']))
+{
+  $key = 'hour';
+  $min_x = 0;
+  $max_x = 23;
+}
+elseif (isset($page['month']))
+{
+  $key = 'day';
+  $min_x = 1;
+  $max_x = date(
+    't',
+    mktime(12, 0, 0, $page['month'], 1, $page['year'])
+    );
+}
+elseif (isset($page['year']))
+{
+  $key = 'month';
+  $min_x = 1;
+  $max_x = 12;
+}
+else
+{
+  $key = 'year';
+}
+
+$max_pages = 1;
 foreach ($summary_lines as $line)
 {
-  // echo '<pre>'; print_r($line); echo '</pre>';
-
-  $value = '';
-  
-  if (isset($line['hour']))
-  {
-    $value.= $line['hour'].' '.l10n('hour');
-  }
-  else if (isset($line['day']))
+  if ($line['nb_pages'] > $max_pages)
+  {
+    $max_pages = $line['nb_pages'];
+  }
+
+  $datas[ $line[$key] ] = $line['nb_pages'];
+}
+
+if (!isset($min_x) and !isset($max_x))
+{
+  $min_x = min(array_keys($datas));
+  $max_x = max(array_keys($datas));
+}
+
+for ($i = $min_x; $i <= $max_x; $i++)
+{
+  if (!isset($datas[$i]))
+  {
+    $datas[$i] = 0;
+  }
+
+  $url = null;
+
+  if (isset($page['day']))
+  {
+    $value = $i.' '.l10n('hour');
+  }
+  else if (isset($page['month']))
   {
     $url =
       PHPWG_ROOT_PATH.'admin.php'
       .'?page=stats'
-      .'&amp;year='.$line['year']
-      .'&amp;month='.$line['month']
-      .'&amp;day='.$line['day']
+      .'&amp;year='.$page['year']
+      .'&amp;month='.$page['month']
+      .'&amp;day='.$i
       ;
 
-    $time = mktime(12, 0, 0, $line['month'], $line['day'], $line['year']);
+    $time = mktime(12, 0, 0, $page['month'], $i, $page['year']);
     
-    $value = '<a href="'.$url.'">';
-    $value.= $line['day'].' ('.$lang['day'][date('w', $time)].')';
-    $value.= "</a>";    
-  }
-  else if (isset($line['month']))
+    $value = $i.' ('.$lang['day'][date('w', $time)].')';
+  }
+  else if (isset($page['year']))
   {
     $url =
       PHPWG_ROOT_PATH.'admin.php'
       .'?page=stats'
-      .'&amp;year='.$line['year']
-      .'&amp;month='.$line['month']
+      .'&amp;year='.$page['year']
+      .'&amp;month='.$i
       ;
     
-    $value = '<a href="'.$url.'">';
-    $value.= $lang['month'][$line['month']];
-    $value.= "</a>";
+    $value = $lang['month'][$i];
   }
   else
@@ -462 +488 @@
       PHPWG_ROOT_PATH.'admin.php'
       .'?page=stats'
-      .'&amp;year='.$line['year']
+      .'&amp;year='.$i
       ;
     
-    $value = '<a href="'.$url.'">';
-    $value.= $line['year'];
-    $value.= "</a>";    
+    $value = $i;
+  }
+
+  if ($datas[$i] != 0 and isset($url))
+  {
+    $value = '<a href="'.$url.'">'.$value.'</a>';
   }
   
@@ -474 +503 @@
     array(
       'VALUE' => $value,
-      'PAGES' => $line['nb_pages'],
-      
-      'T_CLASS' => ($i++ % 2) ? 'row1' : 'row2'
+      'PAGES' => $datas[$i],
+      'WIDTH' => ceil(($datas[$i] * $max_width) / $max_pages ),
       )
     );

trunk/template/yoga/admin/default-layout.css

@@ -144 +144 @@
   color: white;
 } /* PWG Graphic charts */
+
+
+.statBar {
+  height: 10px;
+  background-color: #66f;
+  border: 1px solid black;
+}

trunk/template/yoga/admin/stats.tpl

@@ -4 +4 @@
 <h3>{L_STAT_TITLE}</h3>
 
-<img class="image" src="{SRC_REPORT}" alt="{lang:history chart}" />
-
 <table class="table2" id="dailyStats">
   <tr class="throw">
     <th>{PERIOD_LABEL}</th>
     <th>{lang:Pages seen}</th>
+    <th></th>
   </tr>
 <!-- BEGIN statrow -->
-  <tr class="{statrow.T_CLASS}">
-    <td>{statrow.VALUE}</td>
+  <tr>
+    <td style="white-space: nowrap">{statrow.VALUE}</td>
     <td class="number">{statrow.PAGES}</td>
+    <td><div class="statBar" style="width:{statrow.WIDTH}px" /></td>
   </tr>
 <!-- END statrow -->