# HG changeset patch # User Steven Stallion # Date 2011-04-20 03:37:06 # 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 --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt --- a/doc/hgrc.5.txt +++ b/doc/hgrc.5.txt @@ -1092,6 +1092,9 @@ The full set of options is: 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 --git a/mercurial/hgweb/hgweb_mod.py b/mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py +++ b/mercurial/hgweb/hgweb_mod.py @@ -233,6 +233,7 @@ class hgweb(object): 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 @@ class hgweb(object): tmpl = templater.templater(mapfile, defaults={"url": req.url, + "logourl": logourl, "staticurl": staticurl, "urlbase": urlbase, "repo": self.reponame, diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py +++ b/mercurial/hgweb/hgwebdir_mod.py @@ -347,6 +347,7 @@ class hgwebdir(object): 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 @@ class hgwebdir(object): "footer": footer, "motd": motd, "url": url, + "logourl": logourl, "staticurl": staticurl, "sessionvars": sessionvars}) return tmpl diff --git a/mercurial/templates/gitweb/bookmarks.tmpl b/mercurial/templates/gitweb/bookmarks.tmpl --- a/mercurial/templates/gitweb/bookmarks.tmpl +++ b/mercurial/templates/gitweb/bookmarks.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / bookmarks +Mercurial{repo|escape} / bookmarks
diff --git a/mercurial/templates/gitweb/branches.tmpl b/mercurial/templates/gitweb/branches.tmpl --- a/mercurial/templates/gitweb/branches.tmpl +++ b/mercurial/templates/gitweb/branches.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / branches +Mercurial{repo|escape} / branches
diff --git a/mercurial/templates/gitweb/changelog.tmpl b/mercurial/templates/gitweb/changelog.tmpl --- a/mercurial/templates/gitweb/changelog.tmpl +++ b/mercurial/templates/gitweb/changelog.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / changelog +Mercurial{repo|escape} / changelog
diff --git a/mercurial/templates/gitweb/changeset.tmpl b/mercurial/templates/gitweb/changeset.tmpl --- a/mercurial/templates/gitweb/changeset.tmpl +++ b/mercurial/templates/gitweb/changeset.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / changeset +Mercurial{repo|escape} / changeset
diff --git a/mercurial/templates/gitweb/error.tmpl b/mercurial/templates/gitweb/error.tmpl --- a/mercurial/templates/gitweb/error.tmpl +++ b/mercurial/templates/gitweb/error.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / error +Mercurial{repo|escape} / error
diff --git a/mercurial/templates/gitweb/fileannotate.tmpl b/mercurial/templates/gitweb/fileannotate.tmpl --- a/mercurial/templates/gitweb/fileannotate.tmpl +++ b/mercurial/templates/gitweb/fileannotate.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / annotate +Mercurial{repo|escape} / annotate
diff --git a/mercurial/templates/gitweb/filediff.tmpl b/mercurial/templates/gitweb/filediff.tmpl --- a/mercurial/templates/gitweb/filediff.tmpl +++ b/mercurial/templates/gitweb/filediff.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / diff +Mercurial{repo|escape} / diff
diff --git a/mercurial/templates/gitweb/filelog.tmpl b/mercurial/templates/gitweb/filelog.tmpl --- a/mercurial/templates/gitweb/filelog.tmpl +++ b/mercurial/templates/gitweb/filelog.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / file revisions +Mercurial{repo|escape} / file revisions
diff --git a/mercurial/templates/gitweb/filerevision.tmpl b/mercurial/templates/gitweb/filerevision.tmpl --- a/mercurial/templates/gitweb/filerevision.tmpl +++ b/mercurial/templates/gitweb/filerevision.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / file revision +Mercurial{repo|escape} / file revision
diff --git a/mercurial/templates/gitweb/graph.tmpl b/mercurial/templates/gitweb/graph.tmpl --- a/mercurial/templates/gitweb/graph.tmpl +++ b/mercurial/templates/gitweb/graph.tmpl @@ -9,7 +9,7 @@
-Mercurial{repo|escape} / graph +Mercurial{repo|escape} / graph
diff --git a/mercurial/templates/gitweb/help.tmpl b/mercurial/templates/gitweb/help.tmpl --- a/mercurial/templates/gitweb/help.tmpl +++ b/mercurial/templates/gitweb/help.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / help +Mercurial{repo|escape} / help
diff --git a/mercurial/templates/gitweb/helptopics.tmpl b/mercurial/templates/gitweb/helptopics.tmpl --- a/mercurial/templates/gitweb/helptopics.tmpl +++ b/mercurial/templates/gitweb/helptopics.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / help +Mercurial{repo|escape} / help
diff --git a/mercurial/templates/gitweb/index.tmpl b/mercurial/templates/gitweb/index.tmpl --- a/mercurial/templates/gitweb/index.tmpl +++ b/mercurial/templates/gitweb/index.tmpl @@ -4,7 +4,7 @@
- Mercurial + Mercurial Repositories list
diff --git a/mercurial/templates/gitweb/manifest.tmpl b/mercurial/templates/gitweb/manifest.tmpl --- a/mercurial/templates/gitweb/manifest.tmpl +++ b/mercurial/templates/gitweb/manifest.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / files +Mercurial{repo|escape} / files
diff --git a/mercurial/templates/gitweb/notfound.tmpl b/mercurial/templates/gitweb/notfound.tmpl --- a/mercurial/templates/gitweb/notfound.tmpl +++ b/mercurial/templates/gitweb/notfound.tmpl @@ -5,7 +5,7 @@
-Mercurial Not found: {repo|escape} +Mercurial Not found: {repo|escape}
diff --git a/mercurial/templates/gitweb/search.tmpl b/mercurial/templates/gitweb/search.tmpl --- a/mercurial/templates/gitweb/search.tmpl +++ b/mercurial/templates/gitweb/search.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / search +Mercurial{repo|escape} / search {sessionvars%hiddenformentry} diff --git a/mercurial/templates/gitweb/shortlog.tmpl b/mercurial/templates/gitweb/shortlog.tmpl --- a/mercurial/templates/gitweb/shortlog.tmpl +++ b/mercurial/templates/gitweb/shortlog.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / shortlog +Mercurial{repo|escape} / shortlog
diff --git a/mercurial/templates/gitweb/summary.tmpl b/mercurial/templates/gitweb/summary.tmpl --- a/mercurial/templates/gitweb/summary.tmpl +++ b/mercurial/templates/gitweb/summary.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / summary +Mercurial{repo|escape} / summary {sessionvars%hiddenformentry} diff --git a/mercurial/templates/gitweb/tags.tmpl b/mercurial/templates/gitweb/tags.tmpl --- a/mercurial/templates/gitweb/tags.tmpl +++ b/mercurial/templates/gitweb/tags.tmpl @@ -8,7 +8,7 @@
-Mercurial{repo|escape} / tags +Mercurial{repo|escape} / tags
diff --git a/mercurial/templates/monoblue/footer.tmpl b/mercurial/templates/monoblue/footer.tmpl --- a/mercurial/templates/monoblue/footer.tmpl +++ b/mercurial/templates/monoblue/footer.tmpl @@ -8,7 +8,7 @@
-

mercurial

+

mercurial

diff --git a/mercurial/templates/monoblue/index.tmpl b/mercurial/templates/monoblue/index.tmpl --- a/mercurial/templates/monoblue/index.tmpl +++ b/mercurial/templates/monoblue/index.tmpl @@ -26,7 +26,7 @@
-

mercurial

+

mercurial

diff --git a/mercurial/templates/paper/bookmarks.tmpl b/mercurial/templates/paper/bookmarks.tmpl --- a/mercurial/templates/paper/bookmarks.tmpl +++ b/mercurial/templates/paper/bookmarks.tmpl @@ -10,7 +10,7 @@
    diff --git a/mercurial/templates/paper/branches.tmpl b/mercurial/templates/paper/branches.tmpl --- a/mercurial/templates/paper/branches.tmpl +++ b/mercurial/templates/paper/branches.tmpl @@ -10,7 +10,7 @@
      diff --git a/mercurial/templates/paper/changeset.tmpl b/mercurial/templates/paper/changeset.tmpl --- a/mercurial/templates/paper/changeset.tmpl +++ b/mercurial/templates/paper/changeset.tmpl @@ -5,7 +5,7 @@
        diff --git a/mercurial/templates/paper/error.tmpl b/mercurial/templates/paper/error.tmpl --- a/mercurial/templates/paper/error.tmpl +++ b/mercurial/templates/paper/error.tmpl @@ -6,7 +6,7 @@
          diff --git a/mercurial/templates/paper/fileannotate.tmpl b/mercurial/templates/paper/fileannotate.tmpl --- a/mercurial/templates/paper/fileannotate.tmpl +++ b/mercurial/templates/paper/fileannotate.tmpl @@ -6,7 +6,7 @@
            diff --git a/mercurial/templates/paper/filediff.tmpl b/mercurial/templates/paper/filediff.tmpl --- a/mercurial/templates/paper/filediff.tmpl +++ b/mercurial/templates/paper/filediff.tmpl @@ -6,7 +6,7 @@
              diff --git a/mercurial/templates/paper/filelog.tmpl b/mercurial/templates/paper/filelog.tmpl --- a/mercurial/templates/paper/filelog.tmpl +++ b/mercurial/templates/paper/filelog.tmpl @@ -10,7 +10,7 @@
                diff --git a/mercurial/templates/paper/filerevision.tmpl b/mercurial/templates/paper/filerevision.tmpl --- a/mercurial/templates/paper/filerevision.tmpl +++ b/mercurial/templates/paper/filerevision.tmpl @@ -6,7 +6,7 @@
                  diff --git a/mercurial/templates/paper/graph.tmpl b/mercurial/templates/paper/graph.tmpl --- a/mercurial/templates/paper/graph.tmpl +++ b/mercurial/templates/paper/graph.tmpl @@ -11,7 +11,7 @@
                    diff --git a/mercurial/templates/paper/help.tmpl b/mercurial/templates/paper/help.tmpl --- a/mercurial/templates/paper/help.tmpl +++ b/mercurial/templates/paper/help.tmpl @@ -10,7 +10,7 @@
                      diff --git a/mercurial/templates/paper/helptopics.tmpl b/mercurial/templates/paper/helptopics.tmpl --- a/mercurial/templates/paper/helptopics.tmpl +++ b/mercurial/templates/paper/helptopics.tmpl @@ -10,7 +10,7 @@
                        diff --git a/mercurial/templates/paper/index.tmpl b/mercurial/templates/paper/index.tmpl --- a/mercurial/templates/paper/index.tmpl +++ b/mercurial/templates/paper/index.tmpl @@ -5,7 +5,7 @@
                        - + mercurial
                        diff --git a/mercurial/templates/paper/manifest.tmpl b/mercurial/templates/paper/manifest.tmpl --- a/mercurial/templates/paper/manifest.tmpl +++ b/mercurial/templates/paper/manifest.tmpl @@ -6,7 +6,7 @@
                          diff --git a/mercurial/templates/paper/search.tmpl b/mercurial/templates/paper/search.tmpl --- a/mercurial/templates/paper/search.tmpl +++ b/mercurial/templates/paper/search.tmpl @@ -6,7 +6,7 @@
                            diff --git a/mercurial/templates/paper/shortlog.tmpl b/mercurial/templates/paper/shortlog.tmpl --- a/mercurial/templates/paper/shortlog.tmpl +++ b/mercurial/templates/paper/shortlog.tmpl @@ -10,7 +10,7 @@
                              diff --git a/mercurial/templates/paper/tags.tmpl b/mercurial/templates/paper/tags.tmpl --- a/mercurial/templates/paper/tags.tmpl +++ b/mercurial/templates/paper/tags.tmpl @@ -10,7 +10,7 @@
                                diff --git a/mercurial/templates/spartan/footer.tmpl b/mercurial/templates/spartan/footer.tmpl --- a/mercurial/templates/spartan/footer.tmpl +++ b/mercurial/templates/spartan/footer.tmpl @@ -1,6 +1,6 @@ {motd} diff --git a/mercurial/templates/template-vars.txt b/mercurial/templates/template-vars.txt --- a/mercurial/templates/template-vars.txt +++ b/mercurial/templates/template-vars.txt @@ -29,6 +29,7 @@ annotate an annotated file entries the entries relevant to the page url base url of hgweb interface +logourl base url of logo staticurl base url for static resources