MercurialWebTheme

Changeset

10:7b233ff06ca3
2010-07-12 Paul Boddie raw files shortlog changelog graph Added error, filerevision and tags support. Added branches and tags support to the summary page, introducing a separate branch class in the stylesheet, with other classes modifying the presentation of branch labels/links.
themes/mercurialweb/branchentry.tmpl (file) themes/mercurialweb/error.tmpl (file) themes/mercurialweb/filerevision.tmpl (file) themes/mercurialweb/map (file) themes/mercurialweb/static/style-mercurialweb.css (file) themes/mercurialweb/summary.tmpl (file) themes/mercurialweb/tagentry.tmpl (file) themes/mercurialweb/tags.tmpl (file)
     1.1 --- a/themes/mercurialweb/branchentry.tmpl	Sat Jul 10 20:45:47 2010 +0200
     1.2 +++ b/themes/mercurialweb/branchentry.tmpl	Mon Jul 12 01:48:38 2010 +0200
     1.3 @@ -1,6 +1,6 @@
     1.4  <tr class="parity{parity}">
     1.5    <td>{date|age}</td>
     1.6    <td class="navigation"><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></td>
     1.7 -  <td width="55%"><span class="branch-{status}"><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{branch|escape}</a></span></td>
     1.8 +  <td width="55%"><span class="branch {status}"><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{branch|escape}</a></span></td>
     1.9    <td>{node|short}</td>
    1.10  </tr>
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/themes/mercurialweb/error.tmpl	Mon Jul 12 01:48:38 2010 +0200
     2.3 @@ -0,0 +1,34 @@
     2.4 +{header}
     2.5 +<title>{repo|escape} (error)</title>
     2.6 +</head>
     2.7 +
     2.8 +<body>
     2.9 +
    2.10 +<div id="header">
    2.11 +  <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
    2.12 +  <div class="controls">
    2.13 +    <ul id="navibar">
    2.14 +    <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li
    2.15 +    ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li
    2.16 +    ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
    2.17 +    ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
    2.18 +    ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
    2.19 +    ><li><a href="{url}files{sessionvars%urlparameter}">Files</a></li
    2.20 +    ><li><form id="searchform" action="{url}log"><span class="container">
    2.21 +        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
    2.22 +      </span>
    2.23 +      {sessionvars%hiddenformentry}
    2.24 +      </form>
    2.25 +    </li>
    2.26 +    </ul>
    2.27 +  </div>
    2.28 +  <div id="pageline"></div>
    2.29 +</div>
    2.30 +
    2.31 +<h2>{repo|escape}</h2>
    2.32 +
    2.33 +<h3>Error</h3>
    2.34 +
    2.35 +<p>{error|escape}</p>
    2.36 +
    2.37 +{footer}
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/themes/mercurialweb/filerevision.tmpl	Mon Jul 12 01:48:38 2010 +0200
     3.3 @@ -0,0 +1,53 @@
     3.4 +{header}
     3.5 +<title>{repo|escape} (file {file|escape} at {node|short})</title>
     3.6 +</head>
     3.7 +
     3.8 +<body>
     3.9 +
    3.10 +<div id="header">
    3.11 +  <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
    3.12 +  <div class="controls">
    3.13 +    <ul id="navibar">
    3.14 +    <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li
    3.15 +    ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li
    3.16 +    ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
    3.17 +    ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li
    3.18 +    ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li
    3.19 +    ><li class="current"><span>Files</span></li
    3.20 +    ><li><form id="searchform" action="{url}log"><span class="container">
    3.21 +        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
    3.22 +      </span>
    3.23 +      {sessionvars%hiddenformentry}
    3.24 +      </form>
    3.25 +    </li>
    3.26 +    </ul>
    3.27 +  </div>
    3.28 +  <div id="pageline"></div>
    3.29 +</div>
    3.30 +
    3.31 +<h2>{repo|escape}</h2>
    3.32 +
    3.33 +<h3>{file|escape}</h3>
    3.34 +
    3.35 +<div class="changesetlinks"><div class="changesetchildlinks"></div>{child%filerevlink}</div>
    3.36 +<div class="changeset">{rev}:{node|short}</div>
    3.37 +<div class="changesetlinks"><div class="changesetparentlinks"></div>{parent%filerevlink}</div>
    3.38 +
    3.39 +<table>
    3.40 +  <tbody>
    3.41 +    <tr>
    3.42 +      <td>{date|age}</td>
    3.43 +      <td>{author|person}</td>
    3.44 +      <td class="navigation"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a></td>
    3.45 +      <td width="50%">{desc|strip|escape}</td>
    3.46 +      <td>{branch%branchlabel}</td>
    3.47 +    </tr>
    3.48 +    <tr>
    3.49 +      <td colspan="5" class="file">
    3.50 +        <pre>{text%fileline}</pre>
    3.51 +      </td>
    3.52 +    </tr>
    3.53 +  </tbody>
    3.54 +</table>
    3.55 +
    3.56 +{footer}
     4.1 --- a/themes/mercurialweb/map	Sat Jul 10 20:45:47 2010 +0200
     4.2 +++ b/themes/mercurialweb/map	Mon Jul 12 01:48:38 2010 +0200
     4.3 @@ -3,6 +3,8 @@
     4.4  
     4.5  branches = branches.tmpl
     4.6  changeset = changeset.tmpl
     4.7 +error = error.tmpl
     4.8 +filerevision = filerevision.tmpl
     4.9  header = header.tmpl
    4.10  footer = footer.tmpl
    4.11  index = index.tmpl
    4.12 @@ -10,16 +12,20 @@
    4.13  search = search.tmpl
    4.14  shortlog = shortlog.tmpl
    4.15  summary = summary.tmpl
    4.16 +tags = tags.tmpl
    4.17  
    4.18  branchentry = branchentry.tmpl
    4.19  indexentry = indexentry.tmpl
    4.20  searchentry = searchentry.tmpl
    4.21  shortlogentry = shortlogentry.tmpl
    4.22 +tagentry = tagentry.tmpl
    4.23  
    4.24  archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a> '
    4.25 +branchlabel = '<span class="branch">{name}</span> '
    4.26  branchtag = '<span class="branch"><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{name}</a></span> '
    4.27  changesetlink = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    4.28 -filenodelink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
    4.29 +filerevlink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    4.30 +inbranchlabel = '<span class="inbranch">{name}</span> '
    4.31  inbranchtag = '<span class="inbranch"><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{name}</a></span> '
    4.32  shortloglink = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{label|escape}</a> '
    4.33  tagtag = '<span class="tag">{name}</span> '
    4.34 @@ -30,5 +36,13 @@
    4.35  difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
    4.36  diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
    4.37  
    4.38 +filedifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
    4.39 +fileellipses = '...'
    4.40 +
    4.41 +fileline = '<div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>'
    4.42 +
    4.43 +filenolink = '{file|escape} '
    4.44 +filenodelink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a> '
    4.45 +
    4.46  hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
    4.47  urlparameter = '{separator}{name}={value|urlescape}'
     5.1 --- a/themes/mercurialweb/static/style-mercurialweb.css	Sat Jul 10 20:45:47 2010 +0200
     5.2 +++ b/themes/mercurialweb/static/style-mercurialweb.css	Mon Jul 12 01:48:38 2010 +0200
     5.3 @@ -65,6 +65,13 @@
     5.4      background: #f7f7f7;
     5.5  }
     5.6  
     5.7 +hr {
     5.8 +    background-color: #ccc;
     5.9 +    color: #ccc;
    5.10 +    border: 0;
    5.11 +    height: 1px;
    5.12 +}
    5.13 +
    5.14  /* Styling of headings from the main site. */
    5.15  
    5.16  h1 { font-size: 2em; }
    5.17 @@ -84,31 +91,26 @@
    5.18      background: #f1b500;
    5.19  }
    5.20  
    5.21 -span.branch,
    5.22 -span.branch-open {
    5.23 +span.branch, /* default properties */
    5.24 +span.open {
    5.25      background: #b5f1b5;
    5.26  }
    5.27  
    5.28  span.inbranch,
    5.29 -span.branch-inactive {
    5.30 -    background: #b5b5b5;
    5.31 -}
    5.32 -
    5.33 -span.branch-open,
    5.34 -span.branch-closed,
    5.35 -span.branch-inactive {
    5.36 -    padding: 0.25em 0.5em;
    5.37 +span.inactive {
    5.38 +    background: #b5b5b5 !important;
    5.39  }
    5.40  
    5.41 -span.branch-closed {
    5.42 -    background-color: #f1b5b5;
    5.43 +span.closed {
    5.44 +    background-color: #f1b5b5 !important;
    5.45  }
    5.46  
    5.47 +span.branch a,
    5.48 +span.tag a,
    5.49  span.inbranch a,
    5.50 -span.branch a,
    5.51 -span.branch-open a,
    5.52 -span.branch-closed a,
    5.53 -span.branch-inactive a {
    5.54 +span.open a,
    5.55 +span.closed a,
    5.56 +span.inactive a {
    5.57      color: #000;
    5.58  }
    5.59  
     6.1 --- a/themes/mercurialweb/summary.tmpl	Sat Jul 10 20:45:47 2010 +0200
     6.2 +++ b/themes/mercurialweb/summary.tmpl	Mon Jul 12 01:48:38 2010 +0200
     6.3 @@ -29,7 +29,22 @@
     6.4  
     6.5  <h3>Summary</h3>
     6.6  
     6.7 -<p>...</p>
     6.8 +<table>
     6.9 +  <tbody>
    6.10 +    <tr>
    6.11 +      <th width="10%">Description</th>
    6.12 +      <td>{desc}</td>
    6.13 +    </tr>
    6.14 +    <tr>
    6.15 +      <th>Owner</th>
    6.16 +      <td>{owner|obfuscate}</td>
    6.17 +    </tr>
    6.18 +    <tr>
    6.19 +      <th>Last change</th>
    6.20 +      <td>{lastchange|rfc822date}</td>
    6.21 +    </tr>
    6.22 +  </tbody>
    6.23 +</table>
    6.24  
    6.25  <hr />
    6.26  
    6.27 @@ -41,4 +56,20 @@
    6.28    </tbody>
    6.29  </table>
    6.30  
    6.31 +<h3>Tags</h3>
    6.32 +
    6.33 +<table>
    6.34 +  <tbody>
    6.35 +{tags}
    6.36 +  </tbody>
    6.37 +</table>
    6.38 +
    6.39 +<h3>Branches</h3>
    6.40 +
    6.41 +<table>
    6.42 +  <tbody>
    6.43 +{branches%branchentry}
    6.44 +  </tbody>
    6.45 +</table>
    6.46 +
    6.47  {footer}
     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/themes/mercurialweb/tagentry.tmpl	Mon Jul 12 01:48:38 2010 +0200
     7.3 @@ -0,0 +1,6 @@
     7.4 +<tr class="parity{parity}">
     7.5 +  <td>{date|age}</td>
     7.6 +  <td class="navigation"><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></td>
     7.7 +  <td width="55%"><span class="tag"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></span></td>
     7.8 +  <td>{node|short}</td>
     7.9 +</tr>
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/themes/mercurialweb/tags.tmpl	Mon Jul 12 01:48:38 2010 +0200
     8.3 @@ -0,0 +1,38 @@
     8.4 +{header}
     8.5 +<title>{repo|escape} (tags)</title>
     8.6 +</head>
     8.7 +
     8.8 +<body>
     8.9 +
    8.10 +<div id="header">
    8.11 +  <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
    8.12 +  <div class="controls">
    8.13 +    <ul id="navibar">
    8.14 +    <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li
    8.15 +    ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li
    8.16 +    ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li
    8.17 +    ><li class="current"><span>Tags</span></li
    8.18 +    ><li><a href="{url}tags{sessionvars%urlparameter}">Branches</li
    8.19 +    ><li><a href="{url}files{sessionvars%urlparameter}">Files</a></li
    8.20 +    ><li><form id="searchform" action="{url}log"><span class="container">
    8.21 +        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
    8.22 +      </span>
    8.23 +      {sessionvars%hiddenformentry}
    8.24 +      </form>
    8.25 +    </li>
    8.26 +    </ul>
    8.27 +  </div>
    8.28 +  <div id="pageline"></div>
    8.29 +</div>
    8.30 +
    8.31 +<h2>{repo|escape}</h2>
    8.32 +
    8.33 +<h3>Tags</h3>
    8.34 +
    8.35 +<table>
    8.36 +  <tbody>
    8.37 +{entries%tagentry}
    8.38 +  </tbody>
    8.39 +</table>
    8.40 +
    8.41 +{footer}