upstream/mercurial-mirror Files · mercurial/templates/paper/bookmarks.tmpl

hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904)...

hgweb: allow viewing diffs against p1 or p2 for merge commits (issue3904) This adds UI portion of the feature that has resided in mercurial since 2012. Back then the interface was added together with the code, but was shortly backed out because it was deemed "not ready". Code, however, stayed. For the original feature and its implementation, see issue2810 and d605a82cf189. In short, the backed-out interface had two outstanding issues: 1. it was introducing an entirely new term (baseline) and 2. it was present on every changeset's page, even for changesets with 1 parent (or no parents), which didn't make sense This patch implements a hopefully better interface because: 1. it uses the usual terms (diff) and 2. it only shows up when there actually are 2 parents.

Alexander Plavin - - Load All Authors

File last commit:

r19795:ac08ff37 default


                r23740:9e1f4c65

default

Download file

             bookmarks.tmpl
        
                    56 lines
            
             | 1.6 KiB
            
                | application/x-cheetah
            
             |
                CheetahLexer
            
             / mercurial / templates / paper / bookmarks.tmpl
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      {header}

      <title>{repo|escape}: bookmarks</title>

      <link rel="alternate" type="application/atom+xml"

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
         href="{url|urlescape}atom-bookmarks" title="Atom feed for {repo|escape}: bookmarks" />

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      <link rel="alternate" type="application/rss+xml"

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
         href="{url|urlescape}rss-bookmarks" title="RSS feed for {repo|escape}: bookmarks" />

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </head>

      <body>

      <div class="container">

      <div class="menu">

      <div class="logo">

        Steven Stallion
    
hgweb: support alternate logo url...

              r13964
            
      <a href="{logourl}">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <img src="{staticurl|urlescape}{logoimg}" alt="mercurial" /></a>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </div>

      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <li><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>

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

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      <li class="active">bookmarks</li>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </ul>

      <ul>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

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

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </ul>

        Angel Ezquerra
    
hgweb: add (Atom) subscribe link to the main paper template pages...

              r18200
            
      <p>

      <div class="atom-logo">

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <a href="{url|urlescape}atom-bookmarks" title="subscribe to atom feed">

      <img class="atom-logo" src="{staticurl|urlescape}feed-icon-14x14.png" alt="atom feed">

        Angel Ezquerra
    
hgweb: add (Atom) subscribe link to the main paper template pages...

              r18200
            
      </a>

      </div>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </div>

      <div class="main">

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

              r18258
            
      <h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      <h3>bookmarks</h3>

        Thomas Arendsen Hein
    
hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...

              r18526
            
      <form class="search" action="{url|urlescape}log">

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      {sessionvars%hiddenformentry}

      <p><input name="rev" id="search1" type="text" size="30" /></p>

        Alexander Plavin
    
paper: define searchhint message in map file and use it in other templates

              r19795
            
      <div id="hint">{searchhint}</div>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </form>

      <table class="bigtable">

      <tr>

       <th>bookmark</th>

       <th>node</th>

      </tr>

        Alexander Plavin
    
hgweb: make stripes in bookmark list with CSS

              r19446
            
      <tbody class="stripes2">

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      {entries%bookmarkentry}

        Alexander Plavin
    
hgweb: make stripes in bookmark list with CSS

              r19446
            
      </tbody>

        Alexander Solovyov
    
hgweb: add separate page with bookmarks listing

              r13597
            
      </table>

      </div>

      </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

Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	{header}
		<title>{repo\|escape}: bookmarks</title>
		<link rel="alternate" type="application/atom+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}atom-bookmarks" title="Atom feed for {repo\|escape}: bookmarks" />
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<link rel="alternate" type="application/rss+xml"
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	href="{url\|urlescape}rss-bookmarks" title="RSS feed for {repo\|escape}: bookmarks" />
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</head>
		<body>

		<div class="container">
		<div class="menu">
		<div class="logo">
Steven Stallion hgweb: support alternate logo url...	r13964	<a href="{logourl}">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<img src="{staticurl\|urlescape}{logoimg}" alt="mercurial" /></a>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</div>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}shortlog{sessionvars%urlparameter}">log</a></li>
		<li><a href="{url\|urlescape}graph{sessionvars%urlparameter}">graph</a></li>
		<li><a href="{url\|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<li class="active">bookmarks</li>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</ul>
		<ul>
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<li><a href="{url\|urlescape}help{sessionvars%urlparameter}">help</a></li>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</ul>
Angel Ezquerra hgweb: add (Atom) subscribe link to the main paper template pages...	r18200	<p>
		<div class="atom-logo">
Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<a href="{url\|urlescape}atom-bookmarks" title="subscribe to atom feed">
		<img class="atom-logo" src="{staticurl\|urlescape}feed-icon-14x14.png" alt="atom feed">
Angel Ezquerra hgweb: add (Atom) subscribe link to the main paper template pages...	r18200	</a>
		</div>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</div>

		<div class="main">
Angel Ezquerra <angel.ezquerra at gmail.com> hgweb: add a "URL breadcrumb" to the index and repository pages...	r18258	<h2 class="breadcrumb"><a href="/">Mercurial</a> {pathdef%breadcrumb}</h2>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	<h3>bookmarks</h3>

Thomas Arendsen Hein hgweb: urlescape all urls, HTML escape repo/tag/branch/... names...	r18526	<form class="search" action="{url\|urlescape}log">
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	{sessionvars%hiddenformentry}
		<p><input name="rev" id="search1" type="text" size="30" /></p>
Alexander Plavin paper: define searchhint message in map file and use it in other templates	r19795	<div id="hint">{searchhint}</div>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</form>

		<table class="bigtable">
		<tr>
		<th>bookmark</th>
		<th>node</th>
		</tr>
Alexander Plavin hgweb: make stripes in bookmark list with CSS	r19446	<tbody class="stripes2">
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	{entries%bookmarkentry}
Alexander Plavin hgweb: make stripes in bookmark list with CSS	r19446	</tbody>
Alexander Solovyov hgweb: add separate page with bookmarks listing	r13597	</table>
		</div>
		</div>

		{footer}