upstream/mercurial-mirror Files · mercurial/templates/monoblue/filecomparison.tmpl

hgwebdir: use web.prefix when creating url breadcrumbs (issue3790)...

hgwebdir: use web.prefix when creating url breadcrumbs (issue3790) The web.prefix setting was being ignored when creating the index URL breadcrumbs. We only need to fix hgwebdir and not hgweb because hgweb gets the complete URL request, including the prefix, while hgwebdir gets a "subdir" which does not include the prefix. This fix is slightly different of what was suggested on the bug tracker. In there it was suggested to hide the prefix itself from the breadcrumb. I think that would be a better solution, but it would require changing all the index templates and passing the prefix to the template engine, which may be too big a change for stable during the freeze. For now this fixes the problem, and the fix could be improved during the next cycle.

Angel Ezquerra <angel.ezquerra at gmail.com> - - Load All Authors

File last commit:

r18258:bebb05a7 default


                r18515:bf8bbbf4

stable

Download file

             filecomparison.tmpl
        
                    72 lines
            
             | 2.9 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / monoblue / filecomparison.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
      {header}

      <title>{repo|escape}: comparison {file|escape}</title>

          <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>

          <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/>

      </head>

      <body>

      <div id="container">

          <div class="page-header">

        Angel Ezquerra <angel.ezquerra at gmail.com>
    
hgweb: add a "URL breadcrumb" to the index and repository pages...

              r18258
            
              <h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
              <form action="{url}log">

                  {sessionvars%hiddenformentry}

                  <dl class="search">

                      <dt><label>Search: </label></dt>

                      <dd><input type="text" name="rev" /></dd>

                  </dl>

              </form>

              <ul class="page-nav">

                  <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>

                  <li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>

                  <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>

                  <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>

                  <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>

                  <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>

                  <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>

                  <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>

                  <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>

              </ul>

          </div>

          <ul class="submenu">

              <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>

              <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li>

              <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>

              <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>

              <li class="current">comparison</li>

              <li><a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a></li>

          </ul>

          <h2 class="no-link no-border">comparison: {file|escape}</h2>

          <h3 class="changeset">{file|escape}</h3>

          <dl class="overview">

              {branch%filerevbranch}

              <dt>changeset {rev}</dt>

              <dd><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>

              {parent%filecompparent}

              {child%filecompchild}

          </dl>

          <div class="legend">

            <span class="legendinfo equal">equal</span>

            <span class="legendinfo delete">deleted</span>

            <span class="legendinfo insert">inserted</span>

            <span class="legendinfo replace">replaced</span>

          </div>

          <div class="comparison">

        wujek srujek
    
hgweb: fixes traceback for invalid files by removing top-level template...

              r17302
            
            <table class="bigtable">

              <thead class="header">

                <tr>

                  <th>{leftrev}:{leftnode|short}</th>

                  <th>{rightrev}:{rightnode|short}</th>

                </tr>

              </thead>

              {comparison}

            </table>

        wujek srujek
    
hgweb: side-by-side comparison functionality...

              r17202
            
          </div>

      {footer}

	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

wujek srujek hgweb: side-by-side comparison functionality...	r17202	{header}
		<title>{repo\|escape}: comparison {file\|escape}</title>
		<link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo\|escape}"/>
		<link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo\|escape}"/>
		</head>

		<body>
		<div id="container">
		<div class="page-header">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h1 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb} / file comparison</h1>
wujek srujek hgweb: side-by-side comparison functionality...	r17202
		<form action="{url}log">
		{sessionvars%hiddenformentry}
		<dl class="search">
		<dt><label>Search: </label></dt>
		<dd><input type="text" name="rev" /></dd>
		</dl>
		</form>

		<ul class="page-nav">
		<li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
		<li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
		<li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
		<li><a href="{url}graph/{node\|short}{sessionvars%urlparameter}">graph</a></li>
		<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
		<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
		<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
		<li><a href="{url}file/{node\|short}{path\|urlescape}{sessionvars%urlparameter}">files</a></li>
		<li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
		</ul>
		</div>

		<ul class="submenu">
		<li><a href="{url}file/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">file</a></li>
		<li><a href="{url}log/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">revisions</a></li>
		<li><a href="{url}annotate/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">annotate</a></li>
		<li><a href="{url}diff/{node\|short}/{file\|urlescape}{sessionvars%urlparameter}">diff</a></li>
		<li class="current">comparison</li>
		<li><a href="{url}raw-diff/{node\|short}/{file\|urlescape}">raw</a></li>
		</ul>

		<h2 class="no-link no-border">comparison: {file\|escape}</h2>
		<h3 class="changeset">{file\|escape}</h3>

		<dl class="overview">
		{branch%filerevbranch}
		<dt>changeset {rev}</dt>
		<dd><a href="{url}rev/{node\|short}{sessionvars%urlparameter}">{node\|short}</a></dd>
		{parent%filecompparent}
		{child%filecompchild}
		</dl>

		<div class="legend">
		<span class="legendinfo equal">equal</span>
		<span class="legendinfo delete">deleted</span>
		<span class="legendinfo insert">inserted</span>
		<span class="legendinfo replace">replaced</span>
		</div>

		<div class="comparison">
wujek srujek hgweb: fixes traceback for invalid files by removing top-level template...	r17302	<table class="bigtable">
		<thead class="header">
		<tr>
		<th>{leftrev}:{leftnode\|short}</th>
		<th>{rightrev}:{rightnode\|short}</th>
		</tr>
		</thead>
		{comparison}
		</table>
wujek srujek hgweb: side-by-side comparison functionality...	r17202	</div>

		{footer}