# HG changeset patch
# User devi
# Date 1138431625 -7200
# Node ID 8c3d80c4891be0f9512548b352319bc01eff2747
# Parent  70db89d4f840e84a75c20e491a9af94cd266c972
Правильное написание глагола "прошло"; фиксированные размеры таблиц

diff -r 70db89d4f840 -r 8c3d80c4891b l3-frontend
--- a/l3-frontend	Fri Jan 27 19:47:23 2006 +0200
+++ b/l3-frontend	Sat Jan 28 09:00:25 2006 +0200
@@ -50,6 +50,8 @@
 
     init_variables();
     init_config();
+    $Config{frontend_ico_path}=$Config{frontend_css};
+    $Config{frontend_ico_path}=~s@/[^/]*$@@;
 
     open_mywi_socket();
     load_command_lines_from_xml($Config{"backend_datafile"});
@@ -550,9 +552,9 @@
 
                     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='100%'>"
+                        $result .= "<table class='new_commands_table' width='700'>"
                                 .  "<tr class='new_commands_caption'><td colspan='2' align='right'>$table_caption</td></tr>"
-                                .  "<tr class='new_commands_header'><td width=100>Команда</td><td>Описание</td></tr>"
+                                .  "<tr class='new_commands_header'><td width=100>Команда</td><td width=600>Описание</td></tr>"
                                 .  $new_commands_section 
                                 .  "</table>"
                     }
@@ -574,6 +576,8 @@
             my $minutes_passed =  int($seconds_since_last_command/60);
 
 
+            my $passed_word  = $minutes_passed % 10 == 1 ? "прошла"
+                                                         : "прошло";
             my $minutes_word = $minutes_passed % 100 > 10 
                             && $minutes_passed % 100 < 20 ? "минут" :
                                $minutes_passed % 10 == 1 ? "минута":
@@ -584,7 +588,7 @@
             $this_day_result .= "<tr height='60'>"
                              .  "<td colspan='5' height='$height'>"
                              .  "<font size='-1'>"
-                             .  "прошло ".$minutes_passed." ".$minutes_word
+                             .  $passed_word." ".$minutes_passed." ".$minutes_word
                              .  "</font>"
                              .  "</td></tr>\n";
         }
@@ -609,18 +613,18 @@
                  : "<td width='0'/>";
 
 # CLASS
-        if ($cl->{"err"}) {
-            $this_day_result .= "<td width='8' valign='top'>"
-                             .  "<table><tr><td width='8' height='8' class='err_box'>"
-                             .  "E"
-                             .  "</td></tr></table>"
-                             .  "</td>";
-        }
-        else {
-            $this_day_result .= "<td width='10' valign='top'>"
-                             .  " "
-                             .  "</td>";
-        }
+#        if ($cl->{"err"}) {
+#            $this_day_result .= "<td width='6' valign='top'>"
+#                             .  "<table><tr><td width='6' height='6' class='err_box'>"
+#                             .  "E"
+#                             .  "</td></tr></table>"
+#                             .  "</td>";
+#        }
+#        else {
+#            $this_day_result .= "<td width='10' valign='top'>"
+#                             .  " "
+#                             .  "</td>";
+#        }
 
 # COMMAND
         my $hint = make_comment($cl->{"cline"});
@@ -633,7 +637,9 @@
         $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 . "</pre>\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";
 
 # OUTPUT
         my $last_command = $cl->{"last_command"};
@@ -694,7 +700,7 @@
             if ($new_commands_section) {
                 $result .= "<table class='new_commands_table'>"
                         .  "<tr class='new_commands_caption'><td colspan='2' align='right'>$table_caption</td></tr>"
-                        .  "<tr class='new_commands_header'><td>Команда</td><td>Описание</td></tr>"
+                        .  "<tr class='new_commands_header'><td width='200'>Команда</td><td width='600'>Описание</td></tr>"
                         .  $new_commands_section 
                         .  "</table>"
                         ;