lilalo

changeset 66:563e3ee69ce8

Исправленияэ
author devi
date Fri Jan 27 18:44:23 2006 +0200 (2006-01-27)
parents b7a217f8e963
children 70db89d4f840
files l3-frontend
line diff
     1.1 --- a/l3-frontend	Fri Jan 27 09:53:10 2006 +0200
     1.2 +++ b/l3-frontend	Fri Jan 27 18:44:23 2006 +0200
     1.3 @@ -572,13 +572,17 @@
     1.4          elsif ($seconds_since_last_command > 600) {
     1.5              my $height = $seconds_since_last_command > 1200 ? 100: 60;
     1.6              my $minutes_passed =  int($seconds_since_last_command/60);
     1.7 -            my $minutes_word = $minutes_passed % 10 == 1 ? "минута":
     1.8 +
     1.9 +
    1.10 +            my $minutes_word = $minutes_passed % 100 > 10 
    1.11 +                            && $minutes_passed % 100 < 20 ? "минут" :
    1.12 +                               $minutes_passed % 10 == 1 ? "минута":
    1.13                                 $minutes_passed % 10 == 0 ? "минут" :
    1.14                                 $minutes_passed % 10  > 4 ? "минут" :
    1.15                                                             "минуты";
    1.16  
    1.17              $this_day_result .= "<tr height='60'>"
    1.18 -                             .  "<td colspan='4' height='$height'>"
    1.19 +                             .  "<td colspan='5' height='$height'>"
    1.20                               .  "<font size='-1'>"
    1.21                               .  "прошло ".$minutes_passed." ".$minutes_word
    1.22                               .  "</font>"
    1.23 @@ -601,11 +605,22 @@
    1.24  
    1.25  # TIME
    1.26          $this_day_result .= $Config{"show_time"} =~ /^y/i
    1.27 -                 ? "<td valign='top' class='time' width='$Config{time_width}'>$hour:$min:$sec</td>"
    1.28 +                 ? "<td width='100' valign='top' class='time' width='$Config{time_width}'>$hour:$min:$sec</td>"
    1.29                   : "<td width='0'/>";
    1.30  
    1.31  # CLASS
    1.32 -        $this_day_result .= "<td width='20' valign='top'>F</td>";
    1.33 +        if ($cl->{"err"}) {
    1.34 +            $this_day_result .= "<td width='8' valign='top'>"
    1.35 +                             .  "<table><tr><td width='8' height='8' class='err_box'>"
    1.36 +                             .  "E"
    1.37 +                             .  "</td></tr></table>"
    1.38 +                             .  "</td>";
    1.39 +        }
    1.40 +        else {
    1.41 +            $this_day_result .= "<td width='10' valign='top'>"
    1.42 +                             .  " "
    1.43 +                             .  "</td>";
    1.44 +        }
    1.45  
    1.46  # COMMAND
    1.47          my $hint = make_comment($cl->{"cline"});