From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH 5/6] gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body
Date: Sun, 6 Aug 2006 02:14:33 +0200 [thread overview]
Message-ID: <200608060214.33866.jnareb@gmail.com> (raw)
In-Reply-To: <200608060206.49086.jnareb@gmail.com>
Uses ugly workaround with $bold argument because style is not set via
CSS, but via presentation element <b>...</b>.
Signed-off-by: Jakub Narebski <jnareb@gmail.com>
---
Probably needs better name, too
gitweb/gitweb.perl | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index f402c8f..7ea52b1 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1062,6 +1062,27 @@ sub git_print_page_path {
}
## ......................................................................
+## functions printing or outputting HTML: inline elements
+
+# print, perhaps shortened and with markers, title line
+sub print_title_html {
+ # $bold argument is workaround until style will be set via CSS
+ my ($long, $short, $query, $bold, $extra) = @_;
+ $extra = '' unless defined($extra);
+
+ if (length($short) < length($long)) {
+ print $cgi->a({-href => "$my_uri?" . esc_param($query),
+ -class => "list", -title => $long},
+ ($bold ? "<b>" : "") . esc_html($short) . $extra . ($bold ? "</b>" : ""));
+ } else {
+ print $cgi->a({-href => "$my_uri?" . esc_param($query),
+ -class => "list"},
+ ($bold ? "<b>" : "") . esc_html($long) . $extra . ($bold ? "</b>" : ""));
+ }
+}
+
+
+## ......................................................................
## functions printing large fragments of HTML
sub git_shortlog_body {
@@ -1087,15 +1108,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>";
- 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_title_html($co{'title'}, $co{'title_short'}, "p=$project;a=commit;h=$commit", 1, $ref);
print "</td>\n" .
"<td class=\"link\">" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=commit;h=$commit")}, "commit") . " | " .
@@ -1141,13 +1154,7 @@ sub git_tags_body {
"</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_title_html($comment, $comment_short, "p=$project;a=tag;h=$tag{'id'}");
}
print "</td>\n" .
"<td class=\"selflink\">";
--
1.4.1.1
next prev parent reply other threads:[~2006-08-06 0:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-06 0:06 [PATCH 0/6] gitweb: Further refactoring Jakub Narebski
2006-08-06 0:08 ` [PATCH 1/6] gitweb: Refactor untabifying - converting tabs to spaces Jakub Narebski
2006-08-06 8:31 ` Matthias Lederhofer
2006-08-06 0:11 ` [PATCH 2/6] gitweb: Simplify git_diff_print Jakub Narebski
2006-08-06 9:26 ` Junio C Hamano
2006-08-06 10:22 ` Jakub Narebski
2006-08-06 0:13 ` [PATCH 3/6] gitweb: Remove unused parse_date invocation from git_shortlog_body Jakub Narebski
2006-08-06 0:13 ` [PATCH 4/6] gitweb: Make blob diff -p1 like commit diff Jakub Narebski
2006-08-06 0:14 ` Jakub Narebski [this message]
2006-08-06 0:17 ` [PATCH 6/6] gitweb: Refactor git_history_body Jakub Narebski
2006-08-06 10:01 ` [PATCH 0/6] gitweb: Further refactoring Junio C Hamano
2006-08-06 10:52 ` Jakub Narebski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200608060214.33866.jnareb@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.