# HG changeset patch
# User devi
# Date 1139607324 -7200
# Node ID 58ea78973bbb19acec563ad85d02f27c8f9b62e2
# Parent  a10db759e5872c0e241cd06b9b584c964ec3984f
Вывод таблицы с командами переведён на div'ы.
Наведён относительный порядок с таблицами стилей.
Если прошло > 1 часа, временной интервал выводится в часах

diff -r a10db759e587 -r 58ea78973bbb l3-frontend
--- a/l3-frontend	Thu Feb 09 18:47:04 2006 +0200
+++ b/l3-frontend	Fri Feb 10 23:35:24 2006 +0200
@@ -567,7 +567,7 @@
 
                     my $table_caption = "Таблица ".$table_number++.". ".$Day_Name[$last_wday].". Новые ".$new_entries_of{$entry_class};
                     if ($new_commands_section) {
-                        $result .= "<table class='new_commands_table' width='700'>"
+                        $result .= "<table class='new_commands_table' width='700' cellspacing='0' cellpadding='0'>"
                                 .  "<tr class='new_commands_caption'><td colspan='2' align='right'>$table_caption</td></tr>"
                                 .  "<tr class='new_commands_header'><td width=100>Команда</td><td width=600>Описание</td></tr>"
                                 .  $new_commands_section 
@@ -576,9 +576,9 @@
 
                 }
                 @known_commands = keys %CommandsFDistribution;
-                $result .= "<table width='100%'>\n";
+                #$result .= "<table width='100%'>\n";
                 $result .= $this_day_result;
-                $result .= "</table>";
+                #$result .= "</table>";
             }
 
             push @toc, "<a href='#day$day'>".$Day_Name[$wday]."</a>\n";
@@ -586,13 +586,25 @@
             $last_wday=$wday;
             $this_day_result = q();
         }
+        elsif ($seconds_since_last_command > 7200) {
+            my $hours_passed =  int($seconds_since_last_command/3600);
+            my $passed_word  = $minutes_passed % 10 == 1 ? "прошла"
+                                                         : "прошло";
+            my $hours_word   = $hours_passed % 10 == 1 ?   "часа":
+                                                           "часов";
+            $this_day_result .= "<div class='much_time_passed'>"
+                             .  $passed_word." &gt;".$hours_passed." ".$hours_word
+                             .  "</div>\n";
+        }
         elsif ($seconds_since_last_command > 600) {
-            my $height = $seconds_since_last_command > 1200 ? 100: 60;
             my $minutes_passed =  int($seconds_since_last_command/60);
 
 
-            my $passed_word  = $minutes_passed % 10 == 1 ? "прошла"
-                                                         : "прошло";
+            my $passed_word  = $minutes_passed % 100 > 10 
+                            && $minutes_passed % 100 < 20 ? "прошло"
+                             : $minutes_passed % 10 == 1  ? "прошла"
+                                                          : "прошло";
+
             my $minutes_word = $minutes_passed % 100 > 10 
                             && $minutes_passed % 100 < 20 ? "минут" :
                                $minutes_passed % 10 == 1 ? "минута":
@@ -600,32 +612,38 @@
                                $minutes_passed % 10  > 4 ? "минут" :
                                                            "минуты";
 
-            $this_day_result .= "<tr height='60'>"
-                             .  "<td colspan='5' height='$height'>"
-                             .  "<font size='-1'>"
+            if ($seconds_since_last_command < 1800) {
+            $this_day_result .= "<div class='time_passed'>"
                              .  $passed_word." ".$minutes_passed." ".$minutes_word
-                             .  "</font>"
-                             .  "</td></tr>\n";
+                             .  "</div>\n";
+            }
+            else {
+            $this_day_result .= "<div class='much_time_passed'>"
+                             .  $passed_word." ".$minutes_passed." ".$minutes_word
+                             .  "</div>\n";
+            }
         }
 
-        $this_day_result .= "<tr class='command' id='command:".$cl->{"id"}."'>\n";
+        #$this_day_result .= "<table cellspacing='0' cellpading='0' class='command' id='command:".$cl->{"id"}."' width='100%'><tr>\n";
+        $this_day_result .= "<div class='command' id='command:".$cl->{"id"}."' >\n";
                         
 
 # CONSOLE CHANGE
-        if ( $last_tty ne $cl->{"tty"}) {
+        if ( $last_tty ne $cl->{"tty"} && 0) {
             my $tty = $cl->{"tty"};
-            $this_day_result .= "<td colspan='6'>"
-                                ."<table><tr><td class='ttychange' width='140' align='center'>"
+            $this_day_result .= "<div class='ttychange'>"
                                 . $tty
-                                ."</td></tr></table>"
-                                ."</td></tr><tr>";
+                                ."</div>";
             $last_tty=$cl->{"tty"};
         }
 
 # TIME
-        $this_day_result .= $Config{"show_time"} =~ /^y/i
-                 ? "<td width='100' valign='top' class='time' width='$Config{time_width}'>$hour:$min:$sec</td>"
-                 : "<td width='0'/>";
+        $this_day_result .= "<div class='time'>$hour:$min:$sec</div>" 
+                            if $Config{"show_time"} =~ /^y/i;
+
+        #$this_day_result .= $Config{"show_time"} =~ /^y/i
+        #         ? "<td width='100' valign='top' class='time' width='$Config{time_width}'>$hour:$min:$sec</td>"
+        #         : "<td width='0'/>";
 
 # CLASS
 #        if ($cl->{"err"}) {
@@ -651,10 +669,12 @@
         $cline = "<span title='$hint' class='with_hint'>$cline</span>" if $hint;
         $cline = "<span class='without_hint'>$cline</span>" if !$hint;
 
-        $this_day_result .= "<td class='script'>\n";
-        $this_day_result .= "<pre class='${class}_cline'>\n" . $cline ;
-        $this_day_result .= "<span title='Код завершения ".$cl->{"err"}."'> <img src='".$Config{frontend_ico_path}."/error.png'/></span>" if $cl->{"err"};
-        $this_day_result .= "</pre>\n";
+        $this_day_result .= "<table cellpadding='0' cellspacing='0'><tr><td>\n<div class='cblock_$cl->{class}'>\n";
+        $this_day_result .= "<div class='cline'>\n" . $cline ;      #cline
+        $this_day_result .= "<span title='Код завершения ".$cl->{"err"}."'>\n"
+                         .  "<img src='".$Config{frontend_ico_path}."/error.png'/>\n"
+                         .  "</span>\n" if $cl->{"err"};
+        $this_day_result .= "</div>\n";                             #cline
 
 # OUTPUT
         my $last_command = $cl->{"last_command"};
@@ -663,15 +683,12 @@
         $Config{"suppress_pagers"}  =~ /^y/i && grep ($_ eq $last_command, @{$Config{"pagers"}}) ||
         $Config{"suppress_terminal"}=~ /^y/i && grep ($_ eq $last_command, @{$Config{"terminal"}})
             )) {
-            $this_day_result .= "<pre class='".$class."_output'>" . $output . "</pre>\n";
+            $this_day_result .= "<pre class='output'>\n" . $output . "</pre>\n";
         }   
 
 # DIFF
-        if ( $Config{"show_diffs"} =~ /^y/i && $cl->{"diff"}) {
-            $this_day_result .= "<table><tr><td width='5'/><td class='diff'><pre>"
-                    .  $cl->{"diff"}
-                    .  "</pre></td></tr></table>";
-        }
+        $this_day_result .= "<pre class='diff'>".$cl->{"diff"}."</pre>"
+            if ( $Config{"show_diffs"} =~ /^y/i && $cl->{"diff"});
 
 #NOTES
         if ( $Config{"show_notes"} =~ /^y/i && $cl->{"note"}) {
@@ -680,29 +697,29 @@
             if (not $note =~ s@(http:[a-zA-Z.0-9/_?%-]*)@<a href='$1'>$1</a>@g) {
               $note =~ s@(www\.[a-zA-Z.0-9/_?%-]*)@<a href='$1'>$1</a>@g;
             };
-        #   Ширину пока не используем
-        #   $this_day_result .= "<table width='$Config{note_width}' class='note'>";
-            $this_day_result .= "<table class='note'>";
-            $this_day_result .= "<tr><td class='note_title'>".$cl->{note_title}."</td></tr>" if $cl->{note_title};
-            $this_day_result .= "<tr><td width='100%' class='note_text'>".$note."</td></tr>";
-            $this_day_result .= "</table>\n";
+            $this_day_result .= "<div class='note'>";
+            $this_day_result .= "<div class='note_title'>".$cl->{note_title}."</div>" if $cl->{note_title};
+            $this_day_result .= "<div class='note_text'>".$note."</div>";
+            $this_day_result .= "</div>\n";
         }
 
 # COMMENT
         if ( $Config{"show_comments"} =~ /^y/i) {
             my $comment = make_comment($cl->{"cline"});
             if ($comment) {
-                $this_day_result .= "<table width='$Config{comment_width}'><tr><td width='5'/><td>"
-                        .  "<table class='note' width='100%'>"
+                $this_day_result .= 
+                           "<div class='note' width='100%'>"
                         .  $comment
-                        .  "</table>\n"
-                        .  "</td></tr></table>";
+                        .  "</div>\n"
+                        ;
+                 
             }
         }
 
         # Вывод очередной команды окончен
-        $this_day_result .= "</td>\n";
-        $this_day_result .= "</tr>\n";
+        $this_day_result .= "</div>\n";                     # cblock
+        $this_day_result .= "</td></tr></table>\n"
+                         .  "</div>\n";                     # command
     }
     last: {
         $result .= "<h3 id='day$last_day'>".$Day_Name[$last_wday]."</h3>";
@@ -723,9 +740,9 @@
 
         }
 
-        $result .= "<table width='100%'>\n";
+        #$result .= "<table width='100%'>\n";
         $result .= $this_day_result;
-        $result .= "</table>";
+        #$result .= "</table>";
    }
 
     return ($result, collapse_list (\@toc));
diff -r a10db759e587 -r 58ea78973bbb l3config.pm
--- a/l3config.pm	Thu Feb 09 18:47:04 2006 +0200
+++ b/l3config.pm	Fri Feb 10 23:35:24 2006 +0200
@@ -74,7 +74,7 @@
 
     comment_width       => "300",
     note_width      => "500",
-    time_width      => "60",
+    time_width      => "6em",
 
     "mode"          => "daemon",        # daemon | normal
     "daemon_sleep_interval" => "10",