{"thread":{"id":"4589","subject":"[PATCH] gitweb: style done with stylesheet","startedAt":"2006-06-20T14:58:12Z","lastAt":"2006-06-20T14:58:12Z","messageCount":1,"participants":["Jakub Narebski"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"22142","messageId":"11508154583352-git-send-email-jnareb@gmail.com","threadId":"4589","inReplyTo":null,"subject":"[PATCH] gitweb: style done with stylesheet","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-06-20T14:58:12Z","receivedAt":"2006-06-20T14:58:12Z","isPatch":true,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Replace (almost) all 'style' attributes with 'class' attribute\nand adding rule to CSS file. Some tables use CSS for styling\ninstead of legacy styling attributes.\n\n---\nThis patch needs readable CSS style file gitweb/gitweb.css\nintroduced in previous patch.\n\nIt applies on top of next.\n\n gitweb/gitweb.cgi | 80 ++++++++++++++++++++++--------------------\n gitweb/gitweb.css | 101 ++++++++++++++++++++++++++++++++++++++++++++++++++---\n 2 files changed, 136 insertions(+), 45 deletions(-)\n\neaa8afc21044fcce134777b35bdcfb3e97f8ab8f\ndiff --git a/gitweb/gitweb.cgi b/gitweb/gitweb.cgi\nindex 1b254df..89224e6 100755\n--- a/gitweb/gitweb.cgi\n+++ b/gitweb/gitweb.cgi\n@@ -252,6 +252,19 @@ sub unquote {\n \treturn $str;\n }\n \n+# CSS class for given age value (in seconds)\n+sub age_class {\n+\tmy $age = shift;\n+\n+\tif ($age < 60*60*2) {\n+\t\treturn \"age0\";\n+\t} elsif ($age < 60*60*24*2) {\n+\t\treturn \"age1\";\n+\t} else {\n+\t\treturn \"age2\";\n+\t}\n+}\n+\n sub git_header_html {\n \tmy $status = shift || \"200 OK\";\n \tmy $expires = shift;\n@@ -600,13 +613,13 @@ sub git_diff_print {\n \t\twhile (my $line = <$fd>) {\n \t\t\tchomp($line);\n \t\t\tmy $char = substr($line, 0, 1);\n-\t\t\tmy $color = \"\";\n+\t\t\tmy $diff_class = \"\";\n \t\t\tif ($char eq '+') {\n-\t\t\t\t$color = \" style=\\\"color:#008800;\\\"\";\n+\t\t\t\t$diff_class = \" add\";\n \t\t\t} elsif ($char eq \"-\") {\n-\t\t\t\t$color = \" style=\\\"color:#cc0000;\\\"\";\n+\t\t\t\t$diff_class = \" rem\";\n \t\t\t} elsif ($char eq \"@\") {\n-\t\t\t\t$color = \" style=\\\"color:#990099;\\\"\";\n+\t\t\t\t$diff_class = \" chunk_header\";\n \t\t\t} elsif ($char eq \"\\\\\") {\n \t\t\t\t# skip errors\n \t\t\t\tnext;\n@@ -617,7 +630,7 @@ sub git_diff_print {\n \t\t\t\t\t$line =~ s/\\t/$spaces/;\n \t\t\t\t}\n \t\t\t}\n-\t\t\tprint \"
\" . esc_html($line) . \"
\\n\";\n+\t\t\tprint \"
\" . esc_html($line) . \"
\\n\";\n \t\t}\n \t}\n \tclose $fd;\n@@ -849,7 +862,7 @@ sub git_project_list {\n \t\tclose $fd;\n \t\tprint \"\\n\";\n \t}\n-\tprint \"\\n\" .\n+\tprint \"
\\n\" .\n \t \"\\n\";\n \tif (!defined($order) || (defined($order) && ($order eq \"project\"))) {\n \t\t@projects = sort {$a->{'path'} cmp $b->{'path'}} @projects;\n@@ -888,15 +901,7 @@ sub git_project_list {\n \t\tprint \"\\n\" .\n \t\t \"\\n\" .\n \t\t \"\\n\";\n-\t\tmy $colored_age;\n-\t\tif ($pr->{'commit'}{'age'} < 60*60*2) {\n-\t\t\t$colored_age = \"$pr->{'commit'}{'age_string'}\";\n-\t\t} elsif ($pr->{'commit'}{'age'} < 60*60*24*2) {\n-\t\t\t$colored_age = \"$pr->{'commit'}{'age_string'}\";\n-\t\t} else {\n-\t\t\t$colored_age = \"$pr->{'commit'}{'age_string'}\";\n-\t\t}\n-\t\tprint \"\\n\" .\n+\t\tprint \"\\n\" .\n \t\t \"
\" . $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$pr->{'path'};a=summary\"), -class => \"list\"}, esc_html($pr->{'path'})) . \"$pr->{'descr'}\" . chop_str($pr->{'owner'}, 15) . \"$colored_age{'commit'}{'age'}) . \"\\\">\" . $pr->{'commit'}{'age_string'} . \"\" .\n \t\t $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$pr->{'path'};a=summary\")}, \"summary\") .\n \t\t \" | \" . $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$pr->{'path'};a=shortlog\")}, \"shortlog\") .\n@@ -1240,7 +1245,7 @@ sub git_blame {\n \tprint \"
\" . esc_html($file_name) . \"
\\n\";\n \tprint \"
\\n\";\n \tprint <\n+\n \n \n \n@@ -1261,7 +1266,7 @@ HTML\n \t\tmy $data;\n \t\tmy $age;\n \t\tmy $age_str;\n-\t\tmy $age_style;\n+\t\tmy $age_class;\n \n \t\tchomp $line;\n \t\t$line_class_num = ($line_class_num + 1) % $line_class_len;\n@@ -1273,16 +1278,14 @@ HTML\n \t\t\t$lineno = $4;\n \t\t\t$data = $5;\n \t\t} else {\n-\t\t\tprint qq( \\n);\n+\t\t\tprint qq( \\n);\n \t\t\tnext;\n \t\t}\n \t\t$short_rev = substr ($long_rev, 0, 8);\n \t\t$age = time () - $time;\n \t\t$age_str = age_string ($age);\n \t\t$age_str =~ s/ / /g;\n-\t\t$age_style = 'font-style: italic;';\n-\t\t$age_style .= ' color: #009900; background: transparent;' if ($age < 60*60*24*2);\n-\t\t$age_style .= ' font-weight: bold;' if ($age < 60*60*2);\n+\t\t$age_class = age_class($age);\n \t\t$author = esc_html ($author);\n \t\t$author =~ s/ / /g;\n \t\t# escape tabs\n@@ -1293,15 +1296,14 @@ HTML\n \t\t\t}\n \t\t}\n \t\t$data = esc_html ($data);\n-\t\t$data =~ s/ / /g;\n \n \t\tprint <\n- \n- \n+ \n+ \n \n- \n- \n+ \n+ \n \n HTML\n \t} # while (my $line = <$fd>)\n@@ -1646,7 +1648,7 @@ sub git_tree {\n \t\t\tprint \"\\n\";\n \t\t}\n \t\t$alternate ^= 1;\n-\t\tprint \"\\n\";\n+\t\tprint \"\\n\";\n \t\tif ($t_type eq \"blob\") {\n \t\t\tprint \"\" .\n \t \"\\n\";\n \tprint \"\\n\";\n \tprint \"\\n\";\n-\tprint \"\\n\";\n+\tprint \"\\n\";\n \tprint \"\" .\n \t \"\" .\n-\t \"\" .\n \t \"\" .\n \t\t \"\" .\n-\t\t \"\" .\n+\t\t \"\" .\n \t\t \"
CommitAge
Unable to parse: $line
Unable to parse: $line
$short_rev..$age_str$short_rev..$age_str$author$lineno$data$lineno$data
\" . mode_str($t_mode) . \"\" . mode_str($t_mode) . \"\" .\n \t\t\t $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=blob;h=$t_hash$base_key;f=$base$t_name\"), -class => \"list\"}, esc_html($t_name)) .\n@@ -1912,7 +1914,7 @@ sub git_commit {\n \t \"
$ad{'rfc2822'}\";\n \tif ($ad{'hour_local'} < 6) {\n-\t\tprintf(\" (%02d:%02d %s)\", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});\n+\t\tprintf(\" (%02d:%02d %s)\", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});\n \t} else {\n \t\tprintf(\" (%02d:%02d %s)\", $ad{'hour_local'}, $ad{'minute_local'}, $ad{'tz_local'});\n \t}\n@@ -1920,10 +1922,10 @@ sub git_commit {\n \t \"
committer\" . esc_html($co{'committer'}) . \"
$cd{'rfc2822'}\" . sprintf(\" (%02d:%02d %s)\", $cd{'hour_local'}, $cd{'minute_local'}, $cd{'tz_local'}) . \"
commit$co{'id'}
commit$co{'id'}
tree\" .\n+\t \"\" .\n \t $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=tree;h=$co{'tree'};hb=$hash\"), class => \"list\"}, $co{'tree'}) .\n \t \"\" . $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=tree;h=$co{'tree'};hb=$hash\")}, \"tree\") .\n@@ -1933,7 +1935,7 @@ sub git_commit {\n \tforeach my $par (@$parents) {\n \t\tprint \"
parent\" . $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=commit;h=$par\"), class => \"list\"}, $par) . \"\" . $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=commit;h=$par\"), class => \"list\"}, $par) . \"\" .\n \t\t $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=commit;h=$par\")}, \"commit\") .\n \t\t \" | \" . $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=commitdiff;h=$hash;hp=$par\")}, \"commitdiff\") .\n@@ -1958,7 +1960,7 @@ sub git_commit {\n \t\t}\n \t\tif ($line =~ m/^ *(signed[ \\-]off[ \\-]by[ :]|acked[ \\-]by[ :]|cc[ :])/i) {\n \t\t\t$signed = 1;\n-\t\t\tprint \"\" . esc_html($line) . \"
\\n\";\n+\t\t\tprint \"\" . esc_html($line) . \"
\\n\";\n \t\t} else {\n \t\t\t$signed = 0;\n \t\t\tprint format_log_line_html($line) . \"
\\n\";\n@@ -1970,7 +1972,7 @@ sub git_commit {\n \t\tprint(($#difftree + 1) . \" files changed:\\n\");\n \t}\n \tprint \"\\n\";\n-\tprint \"\\n\";\n+\tprint \"
\\n\";\n \tmy $alternate = 0;\n \tforeach my $line (@difftree) {\n \t\t# ':100644 100644 03b218260e99b78c6df0ed378e59ed9205ccc96d 3b93d5e7cc7f7dd4ebed13a5cc1a4ad976fc94d8 M ls-files.c'\n@@ -1998,12 +2000,12 @@ sub git_commit {\n \t\t\t}\n \t\t\tprint \"\\n\" .\n-\t\t\t \"\\n\" .\n+\t\t\t \"\\n\" .\n \t\t\t \"\\n\";\n \t\t} elsif ($status eq \"D\") {\n \t\t\tprint \"\\n\" .\n-\t\t\t \"\\n\" .\n+\t\t\t \"\\n\" .\n \t\t\t \"\\n\" .\n-\t\t\t \"\\n\" .\n \t\t\t \"\\n\" .\ndiff --git a/gitweb/gitweb.css b/gitweb/gitweb.css\nindex da53eb4..98410f5 100644\n--- a/gitweb/gitweb.css\n+++ b/gitweb/gitweb.css\n@@ -89,14 +89,18 @@ span.age {\n \tposition: relative;\n \tfloat: left;\n \twidth: 142px;\n-\tfont-style:italic;\n+\tfont-style: italic;\n+}\n+\n+div.page_body span.signoff {\n+\tcolor: #888888;\n }\n \n div.log_link {\n \tpadding: 0px 8px;\n \tfont-size: 10px;\n \tfont-family: sans-serif;\n-\tfont-style:normal;\n+\tfont-style: normal;\n \tposition: relative;\n \tfloat: left;\n \twidth: 136px;\n@@ -138,6 +142,14 @@ table {\n \tpadding: 8px 4px;\n }\n \n+table.project_list, table.diff_tree {\n+\tborder-spacing: 0;\n+}\n+\n+table.blame {\n+\tborder-collapse: collapse;\n+}\n+\n th {\n \tpadding: 2px 5px;\n \tfont-size: 12px;\n@@ -156,11 +168,10 @@ tr.dark:hover {\n \tbackground-color: #edece6;\n }\n \n-\n td {\n \tpadding: 2px 5px;\n \tfont-size: 12px;\n-\tvertical-align:top;\n+\tvertical-align: top;\n }\n \n td.link {\n@@ -169,10 +180,77 @@ td.link {\n \tfont-size: 10px;\n }\n \n-div.pre {\n+td.sha1 {\n+\tfont-family: monospace;\n+}\n+\n+td.error {\n+\tcolor: red;\n+\tbackground-color: yellow;\n+}\n+\n+table.diff_tree span.file_status.new {\n+\tcolor: #008000;\n+}\n+\n+table.diff_tree span.file_status.deleted {\n+\tcolor: #c00000;\n+}\n+\n+table.diff_tree span.file_status.moved,\n+table.diff_tree span.file_status.mode_chnge {\n+\tcolor: #777777;\n+}\n+\n+/* age2: 60*60*24*2 <= age */\n+table.project_list td.age2, table.blame td.age2 {\n+\tfont-style: italic;\n+}\n+\n+/* age1: 60*60*2 <= age < 60*60*24*2 */\n+table.project_list td.age1 {\n+\tcolor: #009900;\n+\tfont-style: italic;\n+}\n+\n+table.blame td.age1 {\n+\tcolor: #009900;\n+\tbackground: transparent;\n+}\n+\n+/* age0: age < 60*60*2 */\n+table.project_list td.age0 {\n+\tcolor: #009900;\n+\tfont-style: italic;\n+\tfont-weight: bold;\n+}\n+\n+table.blame td.age0 {\n+\tcolor: #009900;\n+\tbackground: transparent;\n+\tfont-weight: bold;\n+}\n+\n+td.pre, div.pre, div.diff {\n \tfont-family: monospace;\n \tfont-size: 12px;\n \twhite-space: pre;\n+}\n+\n+td.mode {\n+\tfont-family: monospace;\n+}\n+\n+div.diff.add {\n+\tcolor: #008800;\n+}\n+\n+div.diff.rem {\n+\tcolor: #cc0000;\n+}\n+\n+div.diff.chunk_header {\n+\tcolor: #990099;\n }\n \n div.diff_info {\n@@ -196,6 +273,10 @@ div.search {\n \tright: 12px\n }\n \n+td.linenr {\n+\ttext-align: right;\n+}\n+\n a.linenr {\n \tcolor: #999999;\n \ttext-decoration: none\n@@ -229,3 +310,11 @@ span.tag {\n \tborder: 1px solid;\n \tborder-color: #ffffcc #ffee00 #ffee00 #ffffcc;\n }\n+\n+span.atnight {\n+\tcolor: #cc0000;\n+}\n+\n+span.match {\n+\tcolor: #e00000;\n+}\n-- \n1.3.0\n"}]}
\" .\n \t\t\t $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=blob;h=$to_id;hb=$hash;f=$file\"), -class => \"list\"}, esc_html($file)) . \"[new \" . file_type($to_mode) . \"$mode_chng][new \" . file_type($to_mode) . \"$mode_chng]\" . $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=blob;h=$to_id;hb=$hash;f=$file\")}, \"blob\") . \"\" .\n \t\t\t $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=blob;h=$from_id;hb=$hash;f=$file\"), -class => \"list\"}, esc_html($file)) . \"[deleted \" . file_type($from_mode). \"][deleted \" . file_type($from_mode). \"]\" .\n \t\t\t $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=blob;h=$from_id;hb=$hash;f=$file\")}, \"blob\") .\n \t\t\t \" | \" . $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=history;h=$hash;f=$file\")}, \"history\") .\n@@ -2011,7 +2013,7 @@ sub git_commit {\n \t\t} elsif ($status eq \"M\" || $status eq \"T\") {\n \t\t\tmy $mode_chnge = \"\";\n \t\t\tif ($from_mode != $to_mode) {\n-\t\t\t\t$mode_chnge = \" [changed\";\n+\t\t\t\t$mode_chnge = \" [changed\";\n \t\t\t\tif (((oct $from_mode) & S_IFMT) != ((oct $to_mode) & S_IFMT)) {\n \t\t\t\t\t$mode_chnge .= \" from \" . file_type($from_mode) . \" to \" . file_type($to_mode);\n \t\t\t\t}\n@@ -2047,7 +2049,7 @@ sub git_commit {\n \t\t\t}\n \t\t\tprint \"\" .\n \t\t\t $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=blob;h=$to_id;hb=$hash;f=$to_file\"), -class => \"list\"}, esc_html($to_file)) . \"[moved from \" .\n+\t\t\t \"[moved from \" .\n \t\t\t $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=blob;h=$from_id;hb=$hash;f=$from_file\"), -class => \"list\"}, esc_html($from_file)) .\n \t\t\t \" with \" . (int $similarity) . \"% similarity$mode_chng]\" .\n@@ -2407,7 +2409,7 @@ sub git_search {\n \t\t\t\t\tmy $match = esc_html($2) || \"\";\n \t\t\t\t\tmy $trail = esc_html($3) || \"\";\n \t\t\t\t\t$trail = chop_str($trail, 30, 10);\n-\t\t\t\t\tmy $text = \"$lead$match$trail\";\n+\t\t\t\t\tmy $text = \"$lead$match$trail\";\n \t\t\t\t\tprint chop_str($text, 80, 5) . \"
\\n\";\n \t\t\t\t}\n \t\t\t}\n@@ -2456,7 +2458,7 @@ sub git_search {\n \t\t\t\t\twhile (my $setref = shift @files) {\n \t\t\t\t\t\tmy %set = %$setref;\n \t\t\t\t\t\tprint $cgi->a({-href => \"$my_uri?\" . esc_param(\"p=$project;a=blob;h=$set{'id'};hb=$co{'id'};f=$set{'file'}\"), class => \"list\"},\n-\t\t\t\t\t\t \"\" . esc_html($set{'file'}) . \"\") .\n+\t\t\t\t\t\t \"\" . esc_html($set{'file'}) . \"\") .\n \t\t\t\t\t\t \"
\\n\";\n \t\t\t\t\t}\n \t\t\t\t\tprint \"