upstream/mercurial-mirror Commit - r13964:616ad3f6

doc/hgrc.5.txt

0 +3 0

                 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.

mercurial/hgweb/hgweb_mod.py

0 +2 0

                     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 += '/'
                     tmpl = templater.templater(mapfile,
                                                defaults={"url": req.url,
+                                                         "logourl": logourl,
                                                          "staticurl": staticurl,
                                                          "urlbase": urlbase,
                                                          "repo": self.reponame,

mercurial/hgweb/hgwebdir_mod.py

0 +2 0

                     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 += '/'
                                                          "footer": footer,
                                                          "motd": motd,
                                                          "url": url,
+                                                         "logourl": logourl,
                                                          "staticurl": staticurl,
                                                          "sessionvars": sessionvars})
                     return tmpl

mercurial/templates/gitweb/bookmarks.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / bookmarks
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / bookmarks
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/branches.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/changelog.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changelog
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changelog
             </div>
             <form action="{url}log">

mercurial/templates/gitweb/changeset.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changeset
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changeset
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/error.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / error
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / error
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/fileannotate.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / annotate
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / annotate
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/filediff.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/filelog.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revisions
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revisions
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/filerevision.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revision
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file revision
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/graph.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / graph
             </div>
             <form action="{url}log">

mercurial/templates/gitweb/help.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/helptopics.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/index.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-                <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a>
+                <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a>
                 Repositories list
             </div>

mercurial/templates/gitweb/manifest.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / files
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / files
             </div>
             <div class="page_nav">

mercurial/templates/gitweb/notfound.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a> Not found: {repo|escape}
             </div>
             <div class="page_body">

mercurial/templates/gitweb/search.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / search
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / search
             <form action="{url}log">
             {sessionvars%hiddenformentry}

mercurial/templates/gitweb/shortlog.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / shortlog
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / shortlog
             </div>
             <form action="{url}log">

mercurial/templates/gitweb/summary.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / summary
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / summary
             <form action="{url}log">
             {sessionvars%hiddenformentry}

mercurial/templates/gitweb/tags.tmpl

0 +1 -1

             <body>
             <div class="page_header">
-            <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / tags
+            <a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / tags
             </div>
             <div class="page_nav">

mercurial/templates/monoblue/footer.tmpl

0 +1 -1

                 </div>
                 <div id="powered-by">
-                    <p><a href="http://mercurial.selenic.com/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
+                    <p><a href="{logourl}" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
                 </div>
                 <div id="corner-top-left"></div>

mercurial/templates/monoblue/index.tmpl

0 +1 -1

                 </div>
                 <div id="powered-by">
-                    <p><a href="http://mercurial.selenic.com/" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
+                    <p><a href="{logourl}" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p>
                 </div>
                 <div id="corner-top-left"></div>

mercurial/templates/paper/bookmarks.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/branches.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/changeset.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/error.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/fileannotate.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/filediff.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/filelog.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/filerevision.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/graph.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/help.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/helptopics.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/index.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a>
             </div>
             <div class="main">

mercurial/templates/paper/manifest.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/search.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
             </div>
             <ul>

mercurial/templates/paper/shortlog.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/paper/tags.tmpl

0 +1 -1

             <div class="container">
             <div class="menu">
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" alt="mercurial" /></a>
             </div>
             <ul>

mercurial/templates/spartan/footer.tmpl

0 +1 -1

             {motd}
             <div class="logo">
-            <a href="http://mercurial.selenic.com/">
+            <a href="{logourl}">
             <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
             </div>

mercurial/templates/template-vars.txt

0 +1 0

             entries       the entries relevant to the page
             url           base url of hgweb interface
+            logourl       base url of logo
             staticurl     base url for static resources

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages