J.H. wrote:
> I've no objection, you can add a sign-off from me.
Errr... sign-off or ack? Signed-off-by is about provenance of code...
> On 12/18/2010 12:02 PM, Jakub Narebski wrote:
> > To do that, generating "<link />"s to feeds were refactored into
> > print_feed_meta() subroutine, to keep nesting (indent) level in
> > git_header_html() low. This has also the advantage of making code
> > more clear.
> >
> > Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx>
> > ---
> > gitweb/gitweb.perl | 89 +++++++++++++++++++++++++++-------------------------
> > 1 files changed, 47 insertions(+), 42 deletions(-)
> >
> > diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> > index d521c93..d965cda 100755
> > --- a/gitweb/gitweb.perl
> > +++ b/gitweb/gitweb.perl
> > @@ -3479,6 +3479,51 @@ sub get_page_title {
> > return $title;
> > }
> >
> > +sub print_feed_meta {
> > + if (defined $project) {
> > + my %href_params = get_feed_info();
> > + if (!exists $href_params{'-title'}) {
> > + $href_params{'-title'} = 'log';
> > + }
> > +
> > + foreach my $format qw(RSS Atom) {
> > + my $type = lc($format);
> > + my %link_attr = (
> > + '-rel' => 'alternate',
> > + '-title' => esc_attr("$project - $href_params{'-title'} - $format feed"),
> > + '-type' => "application/$type+xml"
> > + );
> > +
> > + $href_params{'action'} = $type;
> > + $link_attr{'-href'} = href(%href_params);
> > + print "<link ".
> > + "rel=\"$link_attr{'-rel'}\" ".
> > + "title=\"$link_attr{'-title'}\" ".
> > + "href=\"$link_attr{'-href'}\" ".
> > + "type=\"$link_attr{'-type'}\" ".
> > + "/>\n";
> > +
> > + $href_params{'extra_options'} = '--no-merges';
> > + $link_attr{'-href'} = href(%href_params);
> > + $link_attr{'-title'} .= ' (no merges)';
> > + print "<link ".
> > + "rel=\"$link_attr{'-rel'}\" ".
> > + "title=\"$link_attr{'-title'}\" ".
> > + "href=\"$link_attr{'-href'}\" ".
> > + "type=\"$link_attr{'-type'}\" ".
> > + "/>\n";
> > + }
> > +
> > + } else {
> > + printf('<link rel="alternate" title="%s projects list" '.
> > + 'href="%s" type="text/plain; charset=utf-8" />'."\n",
> > + esc_attr($site_name), href(project=>undef, action=>"project_index"));
> > + printf('<link rel="alternate" title="%s projects feeds" '.
> > + 'href="%s" type="text/x-opml" />'."\n",
> > + esc_attr($site_name), href(project=>undef, action=>"opml"));
> > + }
> > +}
> > +
> > sub git_header_html {
> > my $status = shift || "200 OK";
> > my $expires = shift;
> > @@ -3528,48 +3573,8 @@ EOF
> > print '<link rel="stylesheet" type="text/css" href="'.esc_url($stylesheet).'"/>'."\n";
> > }
> > }
> > - if (defined $project) {
> > - my %href_params = get_feed_info();
> > - if (!exists $href_params{'-title'}) {
> > - $href_params{'-title'} = 'log';
> > - }
> > -
> > - foreach my $format qw(RSS Atom) {
> > - my $type = lc($format);
> > - my %link_attr = (
> > - '-rel' => 'alternate',
> > - '-title' => esc_attr("$project - $href_params{'-title'} - $format feed"),
> > - '-type' => "application/$type+xml"
> > - );
> > -
> > - $href_params{'action'} = $type;
> > - $link_attr{'-href'} = href(%href_params);
> > - print "<link ".
> > - "rel=\"$link_attr{'-rel'}\" ".
> > - "title=\"$link_attr{'-title'}\" ".
> > - "href=\"$link_attr{'-href'}\" ".
> > - "type=\"$link_attr{'-type'}\" ".
> > - "/>\n";
> > -
> > - $href_params{'extra_options'} = '--no-merges';
> > - $link_attr{'-href'} = href(%href_params);
> > - $link_attr{'-title'} .= ' (no merges)';
> > - print "<link ".
> > - "rel=\"$link_attr{'-rel'}\" ".
> > - "title=\"$link_attr{'-title'}\" ".
> > - "href=\"$link_attr{'-href'}\" ".
> > - "type=\"$link_attr{'-type'}\" ".
> > - "/>\n";
> > - }
> > -
> > - } else {
> > - printf('<link rel="alternate" title="%s projects list" '.
> > - 'href="%s" type="text/plain; charset=utf-8" />'."\n",
> > - esc_attr($site_name), href(project=>undef, action=>"project_index"));
> > - printf('<link rel="alternate" title="%s projects feeds" '.
> > - 'href="%s" type="text/x-opml" />'."\n",
> > - esc_attr($site_name), href(project=>undef, action=>"opml"));
> > - }
> > + print_feed_meta()
> > + if ($status eq '200 OK');
> > if (defined $favicon) {
> > print qq(<link rel="shortcut icon" href=").esc_url($favicon).qq(" type="image/png" />\n);
> > }
>
>
--
Jakub Narebski
Poland
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html