[Compbench-web-devel] compbenchmarks-web/lib interface.pl, 1.26, 1.27

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/compbenchmarks-web/lib
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv24530

Modified Files:
	interface.pl 
Log Message:
'Topic' handling (sub-tabs like).

Index: interface.pl
===================================================================
RCS file: /cvsroot/compbench/compbenchmarks-web/lib/interface.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** interface.pl	10 Oct 2006 17:20:16 -0000	1.26
--- interface.pl	28 Nov 2006 21:48:42 -0000	1.27
***************
*** 22,25 ****
--- 22,26 ----
  our $tab;
  our $dbh;
+ our $topic;
  
  our $CVS_DATE;
***************
*** 64,68 ****
  	     'doc' =>
  	     { 'tabs' => { 'motivations' => 'Motivations',
! 			   'package' => 'Benchmark package',
  			   'benchs' => 'Supported benchmarks' },
  	       'tabs-order' => [ 'motivations',
--- 65,69 ----
  	     'doc' =>
  	     { 'tabs' => { 'motivations' => 'Motivations',
! 			   'package' => "compbenchmarks' documentation",
  			   'benchs' => 'Supported benchmarks' },
  	       'tabs-order' => [ 'motivations',
***************
*** 135,139 ****
  
  sub iface_tabs_start {
!   my $menu = shift;
    my @tabs;
  
--- 136,142 ----
  
  sub iface_tabs_start {
!   my $menu         = shift;
!   my $topics       = shift;
!   my $topics_order = shift;
    my @tabs;
  
***************
*** 195,203 ****
--- 198,218 ----
    print "<tr><td class='pan_3'></td>";
    print "<td class='pan_8' colspan='" . ($n*4+2) . "'>";
+   if (defined($topics)) {
+     print "<table width='100%'><tr><td>";
+     topic_start($topics, $topics_order);
+     print "</td></tr></table>";
+   }
+   print "<td class='pan_4'></td></tr>";
+   print "</td></tr>";
  
+   print "<tr><td class='pan_3'></td>";
+   print "<td class='pan_8' colspan='" . ($n*4+2) . "'>";
    print "<table summary='menu'><tr><td class='tab_contain'>";
    print "<h1>${$menus{$menu}}[0]::";
    print ${$tabs{$menu}->{tabs}}{$tab};
    print "</h1>";
+   if (defined($topics_order)) {
+     print "<h2>$topics->{$topic}</h2>";
+   }
  
  }
***************
*** 226,230 ****
  
  sub iface_start {
!   my $menu = shift;
    my $r_acl;
  
--- 241,249 ----
  
  sub iface_start {
!   my $menu         = shift;
!   my $tab_topics   = shift;
! 
!   my $topics;
!   my $topics_order;
    my $r_acl;
  
***************
*** 233,236 ****
--- 252,256 ----
    print "<tr><td valign='top' class='iface_menu'>";
  
+   $topic=$req->param('topic');
    $tab=$req->param('tab');
    if (!defined($tab)) {
***************
*** 238,241 ****
--- 258,269 ----
    }
  
+   if (!defined($tab_topics)) {
+     $topics=undef;
+     $topics_order=undef;
+   } else {
+     $topics=${$tab_topics->{$tab}}[0];
+     $topics_order=${$tab_topics->{$tab}}[1];
+   }
+ 
    print "<table summary='menus part'>";
    foreach(@menus) {
***************
*** 281,285 ****
    print "</table>";
    print "</td><td valign='top'>";
!   iface_tabs_start($menu);
  }
  
--- 309,313 ----
    print "</table>";
    print "</td><td valign='top'>";
!   iface_tabs_start($menu, $topics, $topics_order);
  }