Changeset 104

Timestamp:

11/28/06 22:32:11 (14 years ago)

Author:

knifee

Message:

Changed the class.box.php to use smarty, and changed all pages that use the class to use the options. Menu Boxes can now be created as follows:
$menubox = new box("Menu");
$menubox->setIcon("menu-item.gif"); // only needed if adding a Menu (ie u want the little icon)
$menubox->addOption("caption","View"); // Add a Caption
$menubox->addOption("link","Name","URL"); // Add a Link
$menubox->addOption("points","Points Value"); // Add points to a Points Box
$menubox->addOption("img","/path to img"); // Add an Image

changed the AwardBox? Class to use smarty, that is called in the same way as before so no need to change anything.

Location:

dev/common

Files:

• admin_menu.php (modified) (1 diff)
• alliance_detail.php (modified) (2 diffs)
• awards.php (modified) (1 diff)
• campaigns.php (modified) (1 diff)
• cc_detail.php (modified) (1 diff)
• class.box.php (modified) (5 diffs)
• contracts.php (modified) (1 diff)
• corp_detail.php (modified) (1 diff)
• home.php (modified) (1 diff)
• kill_detail.php (modified) (2 diffs)
• kills.php (modified) (1 diff)
• losses.php (modified) (1 diff)
• pilot_detail.php (modified) (2 diffs)

dev/common/admin_menu.php

@@ -2 +2 @@
 require_once("class.box.php");
 
-$menubox = new MenuBox();
-$menubox->addOption("Generic", "?a=admin");
-$menubox->addOption("Contracts", "?a=admin_cc&op=view&type=contract");
-$menubox->addOption("Campaigns", "?a=admin_cc&op=view&type=campaign");
-$menubox->addOption("Ship Values", "?a=admin_shp_val");
-$menubox->addOption("Synchronization", "?a=admin_sync");
-$menubox->addOption("Map Options", "?a=admin_mapoptions");
-$menubox->addOption("Post Permissions", "?a=admin_postperm");
-$menubox->addOption("Mods", "?a=admin_mods");
-$menubox->addOption("Auditing", "?a=admin_audit");
-$menubox->addOption("Kill Import - files", "?a=kill_import");
-$menubox->addOption("Kill Import - csv", "?a=kill_import_csv");
-$menubox->addOption("Kill Export - files", "?a=kill_export");
-$menubox->addOption("Kill Export - csv", "?a=kill_export_search");
-$menubox->addOption("Logout", "?a=logout");
+$menubox = new Box();
+$menubox->setIcon("menu-item.gif");
+$menubox->addOption("link","Generic", "?a=admin");
+$menubox->addOption("link","Contracts", "?a=admin_cc&op=view&type=contract");
+$menubox->addOption("link","Campaigns", "?a=admin_cc&op=view&type=campaign");
+$menubox->addOption("link","Ship Values", "?a=admin_shp_val");
+$menubox->addOption("link","Synchronization", "?a=admin_sync");
+$menubox->addOption("link","Map Options", "?a=admin_mapoptions");
+$menubox->addOption("link","Post Permissions", "?a=admin_postperm");
+$menubox->addOption("link","Mods", "?a=admin_mods");
+$menubox->addOption("link","Auditing", "?a=admin_audit");
+$menubox->addOption("link","Kill Import - files", "?a=kill_import");
+$menubox->addOption("link","Kill Import - csv", "?a=kill_import_csv");
+$menubox->addOption("link","Kill Export - files", "?a=kill_export");
+$menubox->addOption("link","Kill Export - csv", "?a=kill_export_search");
+$menubox->addOption("link","Logout", "?a=logout");
 ?>

dev/common/alliance_detail.php

@@ -268 +268 @@
 }
 
-$menubox = new MenuBox();
-$menubox->addCaption("Kills & losses");
-$menubox->addOption("Recent activity", "?a=alliance_detail&all_id=" . $alliance->getID());
-$menubox->addOption("Kills", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=kills");
-$menubox->addOption("Losses", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=losses");
-$menubox->addCaption("Corp statistics");
-$menubox->addOption("Top killers", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=corp_kills");
-$menubox->addOption("Top losers", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=corp_losses");
-
-$menubox->addCaption("Pilot statistics");
-$menubox->addOption("Top killers", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=pilot_kills");
+$menubox = new Box("Menu");
+$menubox->setIcon("menu-item.gif");
+$menubox->addOption("caption","Kills & losses");
+$menubox->addOption("link","Recent activity", "?a=alliance_detail&all_id=" . $alliance->getID());
+$menubox->addOption("link","Kills", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=kills");
+$menubox->addOption("link","Losses", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=losses");
+$menubox->addOption("caption","Corp statistics");
+$menubox->addOption("link","Top killers", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=corp_kills");
+$menubox->addOption("link","Top losers", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=corp_losses");
+
+$menubox->addOption("caption","Pilot statistics");
+$menubox->addOption("link","Top killers", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=pilot_kills");
 
 $killboard = $page->killboard_;
@@ -284 +285 @@
 if ($config->getKillPoints())
     $menubox->addOption("Top scorers", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=pilot_scores");
-$menubox->addOption("Top losers", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=pilot_losses");
-$menubox->addCaption("Global statistics");
-$menubox->addOption("Ships & weapons", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=ships_weapons");
+$menubox->addOption("link","Top losers", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=pilot_losses");
+$menubox->addOption("caption","Global statistics");
+$menubox->addOption("link","Ships & weapons", "?a=alliance_detail&all_id=" . $alliance->getID() . "&view=ships_weapons");
 $page->addContext($menubox->generate());
 

dev/common/awards.php

@@ -156 +156 @@
   $html .= "</td></tr></table>";
 
-  $menubox = new MenuBox();
-  $menubox->addCaption( "Navigation" );
-  $menubox->addOption( "Previous month ", "?a=awards&m=".$pmonth."&y=".$pyear );
+  $menubox = new Box("Menu");
+  $menubox->setIcon("menu-item.gif");
+  $menubox->addOption("caption", "Navigation" );
+  $menubox->addOption("link", "Previous month ", "?a=awards&m=".$pmonth."&y=".$pyear );
   if ( ! ($month == date( "m" ) - 1 && $year == date( "Y" ) ) )
-    $menubox->addOption( "Next month", "?a=awards&m=".$nmonth."&y=".$nyear );
+    $menubox->addOption("link", "Next month", "?a=awards&m=".$nmonth."&y=".$nyear );
   $page->addContext( $menubox->generate() );
   

dev/common/campaigns.php

@@ -27 +27 @@
   }
 
-  $menubox = new MenuBox();
-  $menubox->addOption( "Active campaigns", "?a=campaigns" );
-  $menubox->addOption( "Past campaigns", "?a=campaigns&view=past" );
+  $menubox = new Box("Menu");
+  $menubox->setIcon("menu-item.gif");
+  $menubox->addOption("link", "Active campaigns", "?a=campaigns" );
+  $menubox->addOption("link", "Past campaigns", "?a=campaigns&view=past" );
 
   $page->addContext( $menubox->generate() );

dev/common/cc_detail.php

@@ -183 +183 @@
 }
 
-$menubox = new MenuBox();
-$menubox->addCaption("Overview");
-$menubox->addOption("Target overview", "?a=cc_detail&ctr_id=" . $_GET['ctr_id']);
-$menubox->addCaption("Kills & losses");
-$menubox->addOption("Recent activity", "?a=cc_detail&ctr_id=" . $_GET['ctr_id'] . "&view=recent_activity");
-$menubox->addOption("All kills", "?a=cc_detail&ctr_id=" . $_GET['ctr_id'] . "&view=kills");
-$menubox->addOption("All losses", "?a=cc_detail&ctr_id=" . $_GET['ctr_id'] . "&view=losses");
+$menubox = new box("Menu");
+$menubox->setIcon("menu-item.gif");
+$menubox->addOption("caption","Overview");
+$menubox->addOption("link","Target overview", "?a=cc_detail&ctr_id=" . $_GET['ctr_id']);
+$menubox->addOption("caption","Kills & losses");
+$menubox->addOption("link","Recent activity", "?a=cc_detail&ctr_id=" . $_GET['ctr_id'] . "&view=recent_activity");
+$menubox->addOption("link","All kills", "?a=cc_detail&ctr_id=" . $_GET['ctr_id'] . "&view=kills");
+$menubox->addOption("link","All losses", "?a=cc_detail&ctr_id=" . $_GET['ctr_id'] . "&view=losses");
 
 $page->addContext($menubox->generate());

dev/common/class.box.php

@@ -1 @@
-<?php
+<?php 
 require_once("class.graph.php");
+require_once("globals.php");
 
 class Box
@@ -7 +8 @@
     {
         $this->title_ = $title;
+                $this->box_array = array();
     }
-
-    function setContent($html)
-    {
-        $this->content_ = $html;
-    }
-
-    function setHeight($height)
-    {
-        $this->height_ = $height;
-    }
-
-    function setIcon($icon)
+        
+    function setIcon($icon)                                     //its called setIcon... and it sets the Icon.
     {
         $this->icon_ = $icon;
     }
+        
+        function addOption($type,$name,$url="") //add something to the array that we send to smarty later... types can be caption, img, link, points. Only link needs all 3 attribues 
+        {
+        $this->box_array[]=array('type' => $type, 'name' => $name, 'url' => $url);
+        }
 
-    function generate()
+        function generate()
     {
-        $html = "<table class=kb-table width=150";
-        if ($this->height_) $html .= " height=" . $this->height_;
-        $html .= " cellspacing=\"1\"><tr>";
-        $html .= "<td class=kb-table-header align=center>";
-        if ($this->icon_) $html .= "<img src=\"" . IMG_URL . "/" . $this->icon_ . "\" border=\"0\">";
-        $html .= $this->title_ . "</td></tr>";
-        $html .= "<tr class=kb-table-row-even><td>" . $this->content_ . "</td></tr>";
-        $html .= "</table><p>";
-
-        return $html;
-    }
-}
-
-class MenuBox
-{
-    function MenuBox()
-    {
-        $this->box_ = new Box("Menu");
-        // $this->box_->setIcon( "menu.gif" );
-    }
-
-    function addCaption($name)
-    {
-        $this->html_ .= "<div class=menu-caption>" . $name . "</div>";
-    }
-
-    function addOption($name, $url, $icon = "")
-    {
-        $this->html_ .= "<div class=menu-item>";
-        if ($icon == "") $icon = "menu-item.gif";
-        $this->html_ .= "<img src=\"" . IMG_URL . "/" . $icon . "\" border=\"0\">&nbsp;<a href=\"" . $url . "\">" . $name . "</a><br>";
-        $this->html_ .= "</div>";
-    }
-
-    function setHeight($height)
-    {
-        $this->box_->setHeight($height);
-    }
-
-    function generate()
-    {
-        $this->box_->setContent("<div class=menu-wrapper>" . $this->html_ . "</div>");
-        return $this->box_->generate();
+        //print_r($this->box_array);
+         global $config, $smarty;
+        $smarty->assign('count',count($this->box_array));
+        if($this->icon_){ $smarty->assign('icon',IMG_URL . "/" . $this->icon_); }
+        $smarty->assign('title',$this->title_ );
+        $smarty->assign('items',$this->box_array);
+        return $smarty->fetch('box.tpl');
     }
 }
@@ -76 +37 @@
     function AwardBox($list, $title, $comment, $entity, $award)
     {
+
         $this->toplist_ = $list;
-        $this->box_ = new Box($title);
+        $this->title_ = $title;
         $this->comment_ = $comment;
         $this->entity_ = $entity;
@@ -85 +47 @@
     function generate()
     {
+                global $config, $smarty;
         $rows = array();
         $max = 0;
+
         for ($i = 1; $i < 11; $i++)
         {
@@ -93 +57 @@
             if ($row['cnt'] > $max) $max = $row['cnt'];
         }
+
         if (!$rows[0]['plt_id']) return;
         $pilot = new Pilot($rows[0]['plt_id']);
-
-        $html .= "<table class=kb-subtable cellspacing=0 border=0 width=\"100%\"><tr class=kb-table-row-odd>";
-        $html .= "<td align=left>";
-        $html .= "<img src=\"" . $pilot->getPortraitURL(64) . "\">";
-        $html .= "</td><td align=center>";
-        $html .= "<img src=\"" . IMG_URL . "/awards/" . $this->award_ . ".gif\">";
-        $html .= "</td>";
-        $html .= "</tr></table>";
-        $html .= "<table class=kb-subtable cellspacing=0 border=0 width=\"100%\">";
-        $html .= "<tr><td width=15><b>1.</b></td><td align=left colspan=2><a class=kb-shipclass href=\"?a=pilot_detail&plt_id=" . $rows[0]['plt_id'] . "\">" . $pilot->getName() . "</a></td><td></td></tr><tr>";
+                $smarty->assign('title',$this->title_);
+                $smarty->assign('pilot_portrait',$pilot->getPortraitURL(64));
+                $smarty->assign('award_img',IMG_URL . "/awards/" . $this->award_ . ".gif");
+                $smarty->assign('url',"?a=pilot_detail&plt_id=" . $rows[0]['plt_id'] );
+                $smarty->assign('name',$pilot->getName() );
         $bar = new BarGraph($rows[0]['cnt'], $max, 60);
-        $html .= "<td></td><td align=left>" . $bar->generate() . "</td>";
-        $html .= "<td align=right><b>" . $rows[0]['cnt'] . "</b></td><td></td></tr>";
+                $smarty->assign('bar',$bar->generate());
+                $smarty->assign('cnt', $rows[0]['cnt']);
 
         for ($i = 2; $i < 11; $i++)
         {
             if (!$rows[$i - 1]['plt_id']) break;
-            $pilot = new Pilot($rows[$i - 1]['plt_id']);
-            $html .= "<tr><td><b>" . $i . ".</b></td><td colspan=2><a class=kb-shipclass href=\"?a=pilot_detail&plt_id=" . $rows[$i - 1]['plt_id'] . "\">" . $pilot->getName() . "</a></td></tr><tr>";
-            $bar = new BarGraph($rows[$i - 1]['cnt'], $max, 60);
-            $html .= "<td></td><td align=left>" . $bar->generate() . "</td>";
-            $html .= "<td align=right><b>" . $rows[$i - 1]['cnt'] . "</b></td></tr>";
+            $pilot = new Pilot($rows[$i - 1]['plt_id']); 
+                        $bar = new BarGraph($rows[$i - 1]['cnt'], $max, 60);
+                        $top[] = array('url'=> "?a=pilot_detail&plt_id=" . $rows[$i - 1]['plt_id'], 'name'=>$pilot->getName(),'bar'=>$bar->generate(),'cnt'=>$rows[$i - 1]['cnt']);
         }
-
-        $html .= "<tr><td colspan=3 align=center>(" . $this->comment_ . ")</td></tr>";
-
-        $html .= "</table>";
-
-        $this->box_->setContent($html);
-        return $this->box_->generate();
+                $smarty->assign('top',$top);
+                $smarty->assign('comment',$this->comment_);
+                return $smarty->fetch('award_box.tpl');
     }
+        
 }
 ?>

dev/common/contracts.php

@@ -25 +25 @@
   }
 
-  $menubox = new MenuBox();
-  $menubox->addOption( "Active contracts", "?a=contracts" );
-  $menubox->addOption( "Past contracts", "?a=contracts&view=past" );
+$menubox = new box("Menu");
+$menubox->setIcon("menu-item.gif");
+  $menubox->addOption("link", "Active contracts", "?a=contracts" );
+  $menubox->addOption("link", "Past contracts", "?a=contracts&view=past" );
 
   $page->addContext( $menubox->generate() );

dev/common/corp_detail.php

@@ -306 +306 @@
 }
 
-$menubox = new MenuBox();
-$menubox->addCaption("Kills & losses");
-$menubox->addOption("Recent activity", "?a=corp_detail&crp_id=" . $corp->getID());
-$menubox->addOption("Kills", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=kills");
-$menubox->addOption("Losses", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=losses");
-$menubox->addCaption("Pilot statistics");
-$menubox->addOption("Top killers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_kills");
+$menubox = new box("Menu");
+$menubox->setIcon("menu-item.gif");
+$menubox->addOption("caption","Kills & losses");
+$menubox->addOption("link","Recent activity", "?a=corp_detail&crp_id=" . $corp->getID());
+$menubox->addOption("link","Kills", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=kills");
+$menubox->addOption("link","Losses", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=losses");
+$menubox->addOption("caption","Pilot statistics");
+$menubox->addOption("link","Top killers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_kills");
 
 $killboard = $page->killboard_;
 $config = $killboard->getConfig();
 if ($config->getKillPoints())
-    $menubox->addOption("Top scorers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_scores");
-$menubox->addOption("Top solokillers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_solo");
-$menubox->addOption("Top damagedealers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_damage");
-$menubox->addOption("Top griefers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_griefer");
-$menubox->addOption("Top losers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_losses");
-$menubox->addCaption("Global statistics");
-$menubox->addOption("Ships & weapons", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=ships_weapons");
+    $menubox->addOption("link","Top scorers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_scores");
+$menubox->addOption("link","Top solokillers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_solo");
+$menubox->addOption("link","Top damagedealers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_damage");
+$menubox->addOption("link","Top griefers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_griefer");
+$menubox->addOption("link","Top losers", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=pilot_losses");
+$menubox->addOption("caption","Global statistics");
+$menubox->addOption("link","Ships & weapons", "?a=corp_detail&crp_id=" . $corp->getID() . "&view=ships_weapons");
 $page->addContext($menubox->generate());
 $page->setContent($html);

dev/common/home.php

@@ -93 +93 @@
 
 $page->setContent($html);
-$menubox = new MenuBox();
-$menubox->addCaption("Navigation");
-$menubox->addOption("Previous week", "?a=kills&w=" . $pweek . "&y=" . $pyear);
+$menubox = new box("Menu");
+$menubox->setIcon("menu-item.gif");
+$menubox->addOption("caption","Navigation");
+$menubox->addOption("link","Previous week", "?a=kills&w=" . $pweek . "&y=" . $pyear);
 $page->addContext($menubox->generate());
 

dev/common/kill_detail.php

@@ -190 +190 @@
 $html .= "</td></tr></table>";
 
-$menubox = new MenuBox();
-$menubox->addCaption("View");
-$menubox->addOption("Killmail", "javascript:openWindow( '?a=kill_mail&kll_id=".$kill->getID()."', null, 355, 430, '' );");
+$menubox = new box("Menu");
+$menubox->setIcon("menu-item.gif");
+$menubox->addOption("Caption","View");
+$menubox->addOption("link","Killmail", "javascript:openWindow( '?a=kill_mail&kll_id=".$kill->getID()."', null, 355, 430, '' );");
 if ($kill->relatedKillCount() > 1 || $kill->relatedLossCount() > 1)
 {
-    $menubox->addOption("Related kills (".$kill->relatedKillCount()."/".$kill->relatedLossCount().")", "?a=kill_related&kll_id=".$kill->getID());
+    $menubox->addOption("link","Related kills (".$kill->relatedKillCount()."/".$kill->relatedLossCount().")", "?a=kill_related&kll_id=".$kill->getID());
 }
 if ($page->isAdmin())
 {
-    $menubox->addCaption("Admin");
-    $menubox->addOption("Delete", "javascript:openWindow('?a=kill_delete&kll_id=".$kill->getID()."', null, 420, 300, '' );");
+    $menubox->addOption("caption","Admin");
+    $menubox->addOption("link","Delete", "javascript:openWindow('?a=kill_delete&kll_id=".$kill->getID()."', null, 420, 300, '' );");
 }
 $page->addContext($menubox->generate());
@@ -207 +208 @@
 {
     $scorebox = new Box("Points awarded");
-    $scorebox->setHeight(64);
-    $scorebox->setContent("<div class=kill-points>".$kill->getKillPoints()."</div>");
+    $scorebox->addOption("points",$kill->getKillPoints());
     $page->addContext($scorebox->generate());
 }
 
 $mapbox = new Box("Map");
-$maphtml = "<img src=\"?a=mapview&sys_id=".$system->getID()."&mode=map&size=145\" border=0><br>";
-$maphtml .= "<img src=\"?a=mapview&sys_id=".$system->getID()."&mode=region&size=145\" border=0><br>";
-$maphtml .= "<img src=\"?a=mapview&sys_id=".$system->getID()."&mode=cons&size=145\" border=0>";
-$mapbox->setContent($maphtml);
+$mapbox->addOption("img","?a=mapview&sys_id=".$system->getID()."&mode=map&size=145");
+$mapbox->addOption("img","?a=mapview&sys_id=".$system->getID()."&mode=region&size=145");
+$mapbox->addOption("img","?a=mapview&sys_id=".$system->getID()."&mode=cons&size=145");
+
 $page->addContext($mapbox->generate());
 

dev/common/kills.php

@@ -76 +76 @@
 
   $page->setContent( $html );
-  $menubox = new MenuBox();
-  $menubox->addCaption( "Navigation" );
-  $menubox->addOption( "Previous week ", "?a=kills&w=".$pweek."&y=".$pyear );
+$menubox = new box("Menu");
+$menubox->setIcon("menu-item.gif");
+  $menubox->addOption("caption", "Navigation" );
+  $menubox->addOption("link", "Previous week ", "?a=kills&w=".$pweek."&y=".$pyear );
   if ( $week != date( "W" ) )
     $menubox->addOption( "Next week", "?a=kills&w=".$nweek."&y=".$nyear );

dev/common/losses.php

@@ -80 +80 @@
   $html .= $table->generate();
 
-  $menubox = new MenuBox();
-  $menubox->addCaption( "Navigation" );
-  $menubox->addOption( "Previous week", "?a=losses&w=".$pweek."&y=".$pyear );
+$menubox = new box("Menu");
+$menubox->setIcon("menu-item.gif");
+  $menubox->addOption("caption", "Navigation" );
+  $menubox->addOption("link", "Previous week", "?a=losses&w=".$pweek."&y=".$pyear );
   if ( $week != date( "W" ) )
-    $menubox->addOption( "Next week", "?a=losses&w=".$nweek."&y=".$nyear );
+    $menubox->addOption("link", "Next week", "?a=losses&w=".$nweek."&y=".$nyear );
   $page->addContext( $menubox->generate() );
 

dev/common/pilot_detail.php

@@ -146 +146 @@
 }
 
-$menubox = new MenuBox();
-$menubox->addCaption("Kills & losses");
-$menubox->addOption("Recent activity", "?a=pilot_detail&plt_id=" . $pilot->getID() . "&view=recent");
-$menubox->addOption("Kills", "?a=pilot_detail&plt_id=" . $pilot->getID() . "&view=kills");
-$menubox->addOption("Losses", "?a=pilot_detail&plt_id=" . $pilot->getID() . "&view=losses");
-$menubox->addCaption("Statistics");
-$menubox->addOption("Ships & weapons", "?a=pilot_detail&plt_id=" . $pilot->getID() . "&view=ships_weapons");
+$menubox = new box("Menu");
+$menubox->setIcon("menu-item.gif");
+$menubox->addOption("caption","Kills & losses");
+$menubox->addOption("link","Recent activity", "?a=pilot_detail&plt_id=" . $pilot->getID() . "&view=recent");
+$menubox->addOption("link","Kills", "?a=pilot_detail&plt_id=" . $pilot->getID() . "&view=kills");
+$menubox->addOption("link","Losses", "?a=pilot_detail&plt_id=" . $pilot->getID() . "&view=losses");
+$menubox->addOption("caption","Statistics");
+$menubox->addOption("link","Ships & weapons", "?a=pilot_detail&plt_id=" . $pilot->getID() . "&view=ships_weapons");
 if (strstr($config->getConfig("mods_active"), 'signature_generator'))
 {
-    $menubox->addCaption("Signature");
-    $menubox->addOption("Link", "?a=sig_list&i=" . $pilot->getID());
+    $menubox->addOption("caption","Signature");
+    $menubox->addOption("link","Link", "?a=sig_list&i=" . $pilot->getID());
 }
 $page->addContext($menubox->generate());
@@ -165 +166 @@
 {
     $scorebox = new Box("Kill points");
-    $scorebox->setHeight(64);
-    $scorebox->setContent("<div class=kill-points>" . $points . "</div>");
+    $scorebox->setOption($points);
     $page->addContext($scorebox->generate());
 }