1.1 --- a/l3-frontend	Fri Jan 27 19:47:23 2006 +0200
     1.2 +++ b/l3-frontend	Sat Jan 28 09:00:25 2006 +0200
     1.3 @@ -50,6 +50,8 @@
     1.4  
     1.5      init_variables();
     1.6      init_config();
     1.7 +    $Config{frontend_ico_path}=$Config{frontend_css};
     1.8 +    $Config{frontend_ico_path}=~s@/[^/]*$@@;
     1.9  
    1.10      open_mywi_socket();
    1.11      load_command_lines_from_xml($Config{"backend_datafile"});
    1.12 @@ -550,9 +552,9 @@
    1.13  
    1.14                      my $table_caption = "Таблица ".$table_number++.". ".$Day_Name[$last_wday].". Новые ".$new_entries_of{$entry_class};
    1.15                      if ($new_commands_section) {
    1.16 -                        $result .= "<table class='new_commands_table' width='100%'>"
    1.17 +                        $result .= "<table class='new_commands_table' width='700'>"
    1.18                                  .  "<tr class='new_commands_caption'><td colspan='2' align='right'>$table_caption</td></tr>"
    1.19 -                                .  "<tr class='new_commands_header'><td width=100>Команда</td><td>Описание</td></tr>"
    1.20 +                                .  "<tr class='new_commands_header'><td width=100>Команда</td><td width=600>Описание</td></tr>"
    1.21                                  .  $new_commands_section 
    1.22                                  .  "</table>"
    1.23                      }
    1.24 @@ -574,6 +576,8 @@
    1.25              my $minutes_passed =  int($seconds_since_last_command/60);
    1.26  
    1.27  
    1.28 +            my $passed_word  = $minutes_passed % 10 == 1 ? "прошла"
    1.29 +                                                         : "прошло";
    1.30              my $minutes_word = $minutes_passed % 100 > 10 
    1.31                              && $minutes_passed % 100 < 20 ? "минут" :
    1.32                                 $minutes_passed % 10 == 1 ? "минута":
    1.33 @@ -584,7 +588,7 @@
    1.34              $this_day_result .= "<tr height='60'>"
    1.35                               .  "<td colspan='5' height='$height'>"
    1.36                               .  "<font size='-1'>"
    1.37 -                             .  "прошло ".$minutes_passed." ".$minutes_word
    1.38 +                             .  $passed_word." ".$minutes_passed." ".$minutes_word
    1.39                               .  "</font>"
    1.40                               .  "</td></tr>\n";
    1.41          }
    1.42 @@ -609,18 +613,18 @@
    1.43                   : "<td width='0'/>";
    1.44  
    1.45  # CLASS
    1.46 -        if ($cl->{"err"}) {
    1.47 -            $this_day_result .= "<td width='8' valign='top'>"
    1.48 -                             .  "<table><tr><td width='8' height='8' class='err_box'>"
    1.49 -                             .  "E"
    1.50 -                             .  "</td></tr></table>"
    1.51 -                             .  "</td>";
    1.52 -        }
    1.53 -        else {
    1.54 -            $this_day_result .= "<td width='10' valign='top'>"
    1.55 -                             .  " "
    1.56 -                             .  "</td>";
    1.57 -        }
    1.58 +#        if ($cl->{"err"}) {
    1.59 +#            $this_day_result .= "<td width='6' valign='top'>"
    1.60 +#                             .  "<table><tr><td width='6' height='6' class='err_box'>"
    1.61 +#                             .  "E"
    1.62 +#                             .  "</td></tr></table>"
    1.63 +#                             .  "</td>";
    1.64 +#        }
    1.65 +#        else {
    1.66 +#            $this_day_result .= "<td width='10' valign='top'>"
    1.67 +#                             .  " "
    1.68 +#                             .  "</td>";
    1.69 +#        }
    1.70  
    1.71  # COMMAND
    1.72          my $hint = make_comment($cl->{"cline"});
    1.73 @@ -633,7 +637,9 @@
    1.74          $cline = "<span class='without_hint'>$cline</span>" if !$hint;
    1.75  
    1.76          $this_day_result .= "<td class='script'>\n";
    1.77 -        $this_day_result .= "<pre class='${class}_cline'>\n" . $cline . "</pre>\n";
    1.78 +        $this_day_result .= "<pre class='${class}_cline'>\n" . $cline ;
    1.79 +        $this_day_result .= "<span title='Код завершения ".$cl->{"err"}."'> <img src='".$Config{frontend_ico_path}."/error.png'/></span>" if $cl->{"err"};
    1.80 +        $this_day_result .= "</pre>\n";
    1.81  
    1.82  # OUTPUT
    1.83          my $last_command = $cl->{"last_command"};
    1.84 @@ -694,7 +700,7 @@
    1.85              if ($new_commands_section) {
    1.86                  $result .= "<table class='new_commands_table'>"
    1.87                          .  "<tr class='new_commands_caption'><td colspan='2' align='right'>$table_caption</td></tr>"
    1.88 -                        .  "<tr class='new_commands_header'><td>Команда</td><td>Описание</td></tr>"
    1.89 +                        .  "<tr class='new_commands_header'><td width='200'>Команда</td><td width='600'>Описание</td></tr>"
    1.90                          .  $new_commands_section 
    1.91                          .  "</table>"
    1.92                          ;