From: Junio C Hamano Date: Tue, 24 Oct 2006 03:53:38 +0000 (-0700) Subject: Merge branch 'master' into jc/web X-Git-Tag: v1.4.4-rc1~67^2~7 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ccbb3d17ace70be9d986368d3df795f5961e9683;p=git.git Merge branch 'master' into jc/web * master: (114 commits) gitweb: Fix setting $/ in parse_commit() daemon: do not die on older clients. xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header. git-clone: honor --quiet Documentation for the [remote] config prune-packed: Fix uninitialized variable. ignore-errors requires cl git-send-email: do not pass custom Date: header Use column indexes in git-cvsserver where necessary. gitweb: Add '..' (up directory) to tree view if applicable gitweb: Improve git_print_page_path pager: default to LESS=FRSX not LESS=FRS Make prune also run prune-packed git-vc: better installation instructions gitweb: Do not esc_html $basedir argument to git_print_tree_entry gitweb: Whitespace cleanup - tabs are for indent, spaces are for align (2) Fix usagestring for git-branch git-merge: show usage if run without arguments add the capability for index-pack to read from a stream git-clone: define die() and use it. ... --- ccbb3d17ace70be9d986368d3df795f5961e9683 diff --cc gitweb/gitweb.perl index e119e3342,bc8d8eb23..65d0a145e --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@@ -41,20 -41,12 +41,22 @@@ our $home_link_str = "++GITWEB_HOME_LIN # replace this with something more descriptive for clearer bookmarks our $site_name = "++GITWEB_SITENAME++" || $ENV{'SERVER_NAME'} || "Untitled"; +# filename of html text to include at top of each page +our $site_header = "++GITWEB_SITE_HEADER++"; # html text to include at home page our $home_text = "++GITWEB_HOMETEXT++"; +# filename of html text to include at bottom of each page +our $site_footer = "++GITWEB_SITE_FOOTER++"; + +# URI of stylesheets +our @stylesheets = ("++GITWEB_CSS++"); +our $stylesheet; +# default is not to define style sheet, but it can be overwritten later +undef $stylesheet; - # URI of GIT logo + # URI of default stylesheet + our $stylesheet = "++GITWEB_CSS++"; + # URI of GIT logo (72x27 size) our $logo = "++GITWEB_LOGO++"; # URI of GIT favicon, assumed to be image/png type our $favicon = "++GITWEB_FAVICON++"; @@@ -861,10 -900,11 +925,10 @@@ sub git_get_projects_list if (!defined $path) { next; } - if (-e "$projectroot/$path/HEAD" && (!$export_ok || - -e "$projectroot/$path/$export_ok")) { + if (check_export_ok("$projectroot/$path")) { my $pr = { path => $path, - owner => decode("utf8", $owner, Encode::FB_DEFAULT), + owner => to_utf8($owner), }; push @list, $pr } @@@ -1420,18 -1435,11 +1486,18 @@@ EO } print "\n" . - "\n" . - "

\n" . + "\n"; + + if (-f $site_header) { + open (my $fd, $site_header); + print <$fd>; + close $fd; + } + + print "

\n" . - "" . - " $\"git\"$ " . - "\n"; + $cgi->a({-href => esc_url($logo_url), + -title => $logo_label}, + qq(

)); print $cgi->a({-href => esc_url($home_link)}, $home_link_str) . " / "; if (defined $project) { print $cgi->a({-href => href(action=>"summary")}, esc_html($project));