# HG changeset patch # User Steven Stallion # Date 1303270626 14400 # Node ID 616ad3f6fd33290dc8b06eab753b1d3604e9e5a1 # Parent 8b252e826c68089ca9bf173182d8c82d67ce87fc hgweb: support alternate logo url Clicking on the logo image/text in the hgweb interface brings the user to the Mercurial project page. The majority of users expect that this would bring them to the top level index. I have added a new template variable named `logourl' which allows an administrator to change this behavior. To stay compatible with existing behavior, `logourl' will default to http://mercurial.selenic.com/. This change is very useful in large installations where jumping to the index is common. diff -r 8b252e826c68 -r 616ad3f6fd33 doc/hgrc.5.txt --- a/doc/hgrc.5.txt Tue Apr 19 12:42:53 2011 +0200 +++ b/doc/hgrc.5.txt Tue Apr 19 23:37:06 2011 -0400 @@ -1092,6 +1092,9 @@ Default is False. ``ipv6`` Whether to use IPv6. Default is False. +``logourl`` + Base URL to use for logos. If unset, ``http://mercurial.selenic.com/`` + will be used. ``name`` Repository name to use in the web interface. Default is current working directory. diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/hgweb/hgweb_mod.py Tue Apr 19 23:37:06 2011 -0400 @@ -233,6 +233,7 @@ port = req.env["SERVER_PORT"] port = port != default_port and (":" + port) or "" urlbase = '%s://%s%s' % (proto, req.env['SERVER_NAME'], port) + logourl = self.config("web", "logourl", "http://mercurial.selenic.com/") staticurl = self.config("web", "staticurl") or req.url + 'static/' if not staticurl.endswith('/'): staticurl += '/' @@ -272,6 +273,7 @@ tmpl = templater.templater(mapfile, defaults={"url": req.url, + "logourl": logourl, "staticurl": staticurl, "urlbase": urlbase, "repo": self.reponame, diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/hgweb/hgwebdir_mod.py Tue Apr 19 23:37:06 2011 -0400 @@ -347,6 +347,7 @@ start = url[-1] == '?' and '&' or '?' sessionvars = webutil.sessionvars(vars, start) + logourl = config('web', 'logourl', 'http://mercurial.selenic.com/') staticurl = config('web', 'staticurl') or url + 'static/' if not staticurl.endswith('/'): staticurl += '/' @@ -356,6 +357,7 @@ "footer": footer, "motd": motd, "url": url, + "logourl": logourl, "staticurl": staticurl, "sessionvars": sessionvars}) return tmpl diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/bookmarks.tmpl --- a/mercurial/templates/gitweb/bookmarks.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/bookmarks.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / bookmarks +Mercurial{repo|escape} / bookmarks
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/branches.tmpl --- a/mercurial/templates/gitweb/branches.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/branches.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / branches +Mercurial{repo|escape} / branches
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/changelog.tmpl --- a/mercurial/templates/gitweb/changelog.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/changelog.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / changelog +Mercurial{repo|escape} / changelog
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/changeset.tmpl --- a/mercurial/templates/gitweb/changeset.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/changeset.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / changeset +Mercurial{repo|escape} / changeset
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/error.tmpl --- a/mercurial/templates/gitweb/error.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/error.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / error +Mercurial{repo|escape} / error
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/fileannotate.tmpl --- a/mercurial/templates/gitweb/fileannotate.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/fileannotate.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / annotate +Mercurial{repo|escape} / annotate
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/filediff.tmpl --- a/mercurial/templates/gitweb/filediff.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/filediff.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / diff +Mercurial{repo|escape} / diff
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/filelog.tmpl --- a/mercurial/templates/gitweb/filelog.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/filelog.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / file revisions +Mercurial{repo|escape} / file revisions
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/filerevision.tmpl --- a/mercurial/templates/gitweb/filerevision.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/filerevision.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / file revision +Mercurial{repo|escape} / file revision
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/graph.tmpl --- a/mercurial/templates/gitweb/graph.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/graph.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -9,7 +9,7 @@
-Mercurial{repo|escape} / graph +Mercurial{repo|escape} / graph
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/help.tmpl --- a/mercurial/templates/gitweb/help.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/help.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / help +Mercurial{repo|escape} / help
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/helptopics.tmpl --- a/mercurial/templates/gitweb/helptopics.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/helptopics.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / help +Mercurial{repo|escape} / help
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/index.tmpl --- a/mercurial/templates/gitweb/index.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/index.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -4,7 +4,7 @@
- Mercurial + Mercurial Repositories list
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/manifest.tmpl --- a/mercurial/templates/gitweb/manifest.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/manifest.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / files +Mercurial{repo|escape} / files
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/notfound.tmpl --- a/mercurial/templates/gitweb/notfound.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/notfound.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -5,7 +5,7 @@
-Mercurial Not found: {repo|escape} +Mercurial Not found: {repo|escape}
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/search.tmpl --- a/mercurial/templates/gitweb/search.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/search.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / search +Mercurial{repo|escape} / search {sessionvars%hiddenformentry} diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/shortlog.tmpl --- a/mercurial/templates/gitweb/shortlog.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/shortlog.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / shortlog +Mercurial{repo|escape} / shortlog
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/summary.tmpl --- a/mercurial/templates/gitweb/summary.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/summary.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / summary +Mercurial{repo|escape} / summary {sessionvars%hiddenformentry} diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/gitweb/tags.tmpl --- a/mercurial/templates/gitweb/tags.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/gitweb/tags.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / tags +Mercurial{repo|escape} / tags
diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/monoblue/footer.tmpl --- a/mercurial/templates/monoblue/footer.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/monoblue/footer.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -8,7 +8,7 @@
-

mercurial

+

mercurial

diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/monoblue/index.tmpl --- a/mercurial/templates/monoblue/index.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/monoblue/index.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -26,7 +26,7 @@
-

mercurial

+

mercurial

diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/bookmarks.tmpl --- a/mercurial/templates/paper/bookmarks.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/bookmarks.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -10,7 +10,7 @@
    diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/branches.tmpl --- a/mercurial/templates/paper/branches.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/branches.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -10,7 +10,7 @@
      diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/changeset.tmpl --- a/mercurial/templates/paper/changeset.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/changeset.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -5,7 +5,7 @@
        diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/error.tmpl --- a/mercurial/templates/paper/error.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/error.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -6,7 +6,7 @@
          diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/fileannotate.tmpl --- a/mercurial/templates/paper/fileannotate.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/fileannotate.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -6,7 +6,7 @@
            diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/filediff.tmpl --- a/mercurial/templates/paper/filediff.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/filediff.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -6,7 +6,7 @@
              diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/filelog.tmpl --- a/mercurial/templates/paper/filelog.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/filelog.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -10,7 +10,7 @@
                diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/filerevision.tmpl --- a/mercurial/templates/paper/filerevision.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/filerevision.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -6,7 +6,7 @@
                  diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/graph.tmpl --- a/mercurial/templates/paper/graph.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/graph.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -11,7 +11,7 @@
                    diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/help.tmpl --- a/mercurial/templates/paper/help.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/help.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -10,7 +10,7 @@
                      diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/helptopics.tmpl --- a/mercurial/templates/paper/helptopics.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/helptopics.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -10,7 +10,7 @@
                        diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/index.tmpl --- a/mercurial/templates/paper/index.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/index.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -5,7 +5,7 @@
                        - + mercurial
                        diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/manifest.tmpl --- a/mercurial/templates/paper/manifest.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/manifest.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -6,7 +6,7 @@
                          diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/search.tmpl --- a/mercurial/templates/paper/search.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/search.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -6,7 +6,7 @@
                            diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/shortlog.tmpl --- a/mercurial/templates/paper/shortlog.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/shortlog.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -10,7 +10,7 @@
                              diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/paper/tags.tmpl --- a/mercurial/templates/paper/tags.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/paper/tags.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -10,7 +10,7 @@
                                diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/spartan/footer.tmpl --- a/mercurial/templates/spartan/footer.tmpl Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/spartan/footer.tmpl Tue Apr 19 23:37:06 2011 -0400 @@ -1,6 +1,6 @@ {motd} diff -r 8b252e826c68 -r 616ad3f6fd33 mercurial/templates/template-vars.txt --- a/mercurial/templates/template-vars.txt Tue Apr 19 12:42:53 2011 +0200 +++ b/mercurial/templates/template-vars.txt Tue Apr 19 23:37:06 2011 -0400 @@ -29,6 +29,7 @@ entries the entries relevant to the page url base url of hgweb interface +logourl base url of logo staticurl base url for static resources