gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body

Separate printing of perhaps shortened title (subject) in
git_shortlog_body and git_tags_body into format_subject_html.

While at it, remove presentation element <b>...</b> used to format
title (subject) and move formatting to CSS.

Signed-off-by: Jakub Narebski <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/gitweb.css b/gitweb.css
index b2e665c9b287ac0f54a868e25dcb9966129e1c8ac3d0694649d17b24f1b7a1d9..641381226a0e6ffa3d7069edb6f4d6a82761d1865ee6230b967749d652e32ff8 100644 (file)
--- a/gitweb.css
+++ b/gitweb.css
@@ -117,9 +117,14 @@ div.list_head {
 
 a.list {
        text-decoration: none;
 
 a.list {
        text-decoration: none;

+       font-weight: bold;

        color: #000000;
 }
 
        color: #000000;
 }
 

+table.tags a.list {
+       font-weight: normal;
+}
+

 a.list:hover {
        text-decoration: underline;
        color: #880000;
 a.list:hover {
        text-decoration: underline;
        color: #880000;

diff --git a/gitweb.perl b/gitweb.perl
index eae51bab2f0a0381b4a8cb563b2810155bae3d9ab8d8bd53441a41c16683bbb0..84c274de2107ea798b28205af8885e957375f4b115031401e421f591fc4aa082 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -372,6 +372,22 @@ sub format_ref_marker {
        }
 }
 
        }
 }
 

+# format, perhaps shortened and with markers, title line
+sub format_subject_html {
+       my ($long, $short, $query, $extra) = @_;
+       $extra = '' unless defined($extra);
+
+       if (length($short) < length($long)) {
+               return $cgi->a({-href => "$my_uri?" . esc_param($query),
+                              -class => "list", -title => $long},
+                      esc_html($short) . $extra);
+       } else {
+               return $cgi->a({-href => "$my_uri?" . esc_param($query),
+                              -class => "list"},
+                      esc_html($long)  . $extra);
+       }
+}
+

 ## ----------------------------------------------------------------------
 ## git utility subroutines, invoking git commands
 
 ## ----------------------------------------------------------------------
 ## git utility subroutines, invoking git commands
 


@@ -1085,15 +1101,7 @@ sub git_shortlog_body {
                print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                      "<td><i>" . esc_html(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
                      "<td>";
                print "<td title=\"$co{'age_string_age'}\"><i>$co{'age_string_date'}</i></td>\n" .
                      "<td><i>" . esc_html(chop_str($co{'author_name'}, 10)) . "</i></td>\n" .
                      "<td>";

-               if (length($co{'title_short'}) < length($co{'title'})) {
-                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"),
-                                      -class => "list", -title => "$co{'title'}"},
-                             "<b>" . esc_html($co{'title_short'}) . "$ref</b>");
-               } else {
-                       print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit"),
-                                      -class => "list"},
-                             "<b>" . esc_html($co{'title'}) . "$ref</b>");
-               }
+               print format_subject_html($co{'title'}, $co{'title_short'}, "p=$project;a=commit;h=$commit", $ref);

                print "</td>\n" .
                      "<td class=\"link\">" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") . " | " .
                print "</td>\n" .
                      "<td class=\"link\">" .
                      $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") . " | " .


@@ -1139,13 +1147,7 @@ sub git_tags_body {
                      "</td>\n" .
                      "<td>";
                if (defined $comment) {
                      "</td>\n" .
                      "<td>";
                if (defined $comment) {

-                       if (length($comment_short) < length($comment)) {
-                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}"),
-                                              -class => "list", -title => $comment}, $comment_short);
-                       } else {
-                               print $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tag;h=$tag{'id'}"),
-                                              -class => "list"}, $comment);
-                       }
+                       print format_subject_html($comment, $comment_short, "p=$project;a=tag;h=$tag{'id'}");

                }
                print "</td>\n" .
                      "<td class=\"selflink\">";
                }
                print "</td>\n" .
                      "<td class=\"selflink\">";