MercurialWebTheme

Changeset

2:d536199495b4
2010-06-04 Paul Boddie raw files shortlog changelog graph Used primitive formatting of the HTML in order to avoid whitespace issues in the navigation menus. Added a pop-up hint for the search box, and added the search box to other templates. Adjusted table margins. Added support for search box highlighting, adjusting the display properties for the searchform element and the container element inside it. Added elementary search result presentation support. Adjusted the titles of the templates.
themes/mercurialweb/index.tmpl (file) themes/mercurialweb/map (file) themes/mercurialweb/search.tmpl (file) themes/mercurialweb/searchentry.tmpl (file) themes/mercurialweb/shortlog.tmpl (file) themes/mercurialweb/static/style-mercurialweb.css (file) themes/mercurialweb/summary.tmpl (file)
     1.1 --- a/themes/mercurialweb/index.tmpl	Thu Jun 03 23:33:25 2010 +0200
     1.2 +++ b/themes/mercurialweb/index.tmpl	Fri Jun 04 00:53:32 2010 +0200
     1.3 @@ -1,5 +1,5 @@
     1.4  {header}
     1.5 -<title>Repository Index</title>
     1.6 +<title>Index of repositories</title>
     1.7  </head>
     1.8  
     1.9  <body>
     2.1 --- a/themes/mercurialweb/map	Thu Jun 03 23:33:25 2010 +0200
     2.2 +++ b/themes/mercurialweb/map	Fri Jun 04 00:53:32 2010 +0200
     2.3 @@ -5,9 +5,12 @@
     2.4  footer = footer.tmpl
     2.5  index = index.tmpl
     2.6  indexentry = indexentry.tmpl
     2.7 +search = search.tmpl
     2.8 +searchentry = searchentry.tmpl
     2.9  shortlog = shortlog.tmpl
    2.10  shortlogentry = shortlogentry.tmpl
    2.11  summary = summary.tmpl
    2.12  
    2.13 +archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a> '
    2.14 +hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
    2.15  urlparameter = '{separator}{name}={value|urlescape}'
    2.16 -archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a> '
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/themes/mercurialweb/search.tmpl	Fri Jun 04 00:53:32 2010 +0200
     3.3 @@ -0,0 +1,35 @@
     3.4 +{header}
     3.5 +<title>{repo|escape} (search)</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}files{sessionvars%urlparameter}">files</a></li
    3.19 +    ><li><form id="searchform" action="{url}log"><span class="container">
    3.20 +        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
    3.21 +      </span>
    3.22 +      {sessionvars%hiddenformentry}
    3.23 +      </form>
    3.24 +    </li>
    3.25 +    </ul>
    3.26 +  </div>
    3.27 +  <div id="pageline"></div>
    3.28 +</div>
    3.29 +
    3.30 +<h2>Results</h2>
    3.31 +
    3.32 +<table>
    3.33 +  <tbody>
    3.34 +{entries}
    3.35 +  </tbody>
    3.36 +</table>
    3.37 +
    3.38 +{footer}
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/themes/mercurialweb/searchentry.tmpl	Fri Jun 04 00:53:32 2010 +0200
     4.3 @@ -0,0 +1,6 @@
     4.4 +<tr class="parity{parity}">
     4.5 +  <td>{date|age} ago</td>
     4.6 +  <td>{author|person}</td>
     4.7 +  <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape}</a></td>
     4.8 +  <td><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></td>
     4.9 +</tr>
     5.1 --- a/themes/mercurialweb/shortlog.tmpl	Thu Jun 03 23:33:25 2010 +0200
     5.2 +++ b/themes/mercurialweb/shortlog.tmpl	Fri Jun 04 00:53:32 2010 +0200
     5.3 @@ -1,5 +1,5 @@
     5.4  {header}
     5.5 -<title>Shortlog: {repo|escape}</title>
     5.6 +<title>{repo|escape} (shortlog)</title>
     5.7  </head>
     5.8  
     5.9  <body>
    5.10 @@ -8,8 +8,15 @@
    5.11    <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
    5.12    <div class="controls">
    5.13      <ul id="navibar">
    5.14 -    <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li><li class="current"><span>shortlog</span></li><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li><li><a href="{url}files{sessionvars%urlparameter}">files</a></li><li><form id="searchform" action="{url}log">
    5.15 -      <input name="rev" id="searchinput" type="text" size="20" /><span class="hack"> </span>
    5.16 +    <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li
    5.17 +    ><li class="current"><span>shortlog</span></li
    5.18 +    ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
    5.19 +    ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
    5.20 +    ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
    5.21 +    ><li><form id="searchform" action="{url}log"><span class="container">
    5.22 +        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
    5.23 +      </span>
    5.24 +      {sessionvars%hiddenformentry}
    5.25        </form>
    5.26      </li>
    5.27      </ul>
    5.28 @@ -17,6 +24,8 @@
    5.29    <div id="pageline"></div>
    5.30  </div>
    5.31  
    5.32 +<h2>Shortlog</h2>
    5.33 +
    5.34  <table>
    5.35    <tbody>
    5.36  {entries%shortlogentry}
     6.1 --- a/themes/mercurialweb/static/style-mercurialweb.css	Thu Jun 03 23:33:25 2010 +0200
     6.2 +++ b/themes/mercurialweb/static/style-mercurialweb.css	Fri Jun 04 00:53:32 2010 +0200
     6.3 @@ -38,7 +38,7 @@
     6.4  
     6.5  table
     6.6  {
     6.7 -    margin: 1em;
     6.8 +    margin: 0 1em 1em 1em;
     6.9      border-collapse: collapse;
    6.10  }
    6.11  
    6.12 @@ -102,6 +102,9 @@
    6.13  
    6.14  #navibar a:hover, #navibar a:focus, #navibar li.current a, #navibar li.current span {
    6.15      background: #00b5f1;
    6.16 +}
    6.17 +
    6.18 +#navibar a:hover, #navibar a:focus, #navibar li.current a {
    6.19      text-decoration: none;
    6.20  }
    6.21  
    6.22 @@ -128,7 +131,12 @@
    6.23  }
    6.24  
    6.25  #searchform {
    6.26 +    display: inline;
    6.27 +}
    6.28 +
    6.29 +#searchform span.container {
    6.30      display: inline-block;
    6.31 +    position: relative;
    6.32  
    6.33      /* Margin and padding correspond to the navibar settings. */
    6.34  
    6.35 @@ -142,6 +150,22 @@
    6.36      line-height: 42px;
    6.37  }
    6.38  
    6.39 +#searchform span.container span.hint {
    6.40 +    display: none;
    6.41 +}
    6.42 +
    6.43 +#searchform span.container:hover span.hint {
    6.44 +    display: block;
    6.45 +    position: absolute;
    6.46 +    top: 42px;
    6.47 +    left: 16px;
    6.48 +
    6.49 +    padding: 0 16px;
    6.50 +
    6.51 +    background: #00b5f1;
    6.52 +    color: #fff;
    6.53 +}
    6.54 +
    6.55  #searchform input {
    6.56      vertical-align: middle;
    6.57  }
     7.1 --- a/themes/mercurialweb/summary.tmpl	Thu Jun 03 23:33:25 2010 +0200
     7.2 +++ b/themes/mercurialweb/summary.tmpl	Fri Jun 04 00:53:32 2010 +0200
     7.3 @@ -1,5 +1,5 @@
     7.4  {header}
     7.5 -<title>Summary: {repo|escape}</title>
     7.6 +<title>{repo|escape} (summary)</title>
     7.7  </head>
     7.8  
     7.9  <body>
    7.10 @@ -8,10 +8,34 @@
    7.11    <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div>
    7.12    <div class="controls">
    7.13      <ul id="navibar">
    7.14 -    <li class="current"><span>summary</span></li><li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li><li><a href="{url}files{sessionvars%urlparameter}">files</a></li>
    7.15 +    <li class="current"><span>summary</span></li
    7.16 +    ><li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li
    7.17 +    ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
    7.18 +    ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
    7.19 +    ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
    7.20 +    ><li><form id="searchform" action="{url}log"><span class="container">
    7.21 +        <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
    7.22 +      </span>
    7.23 +      {sessionvars%hiddenformentry}
    7.24 +      </form>
    7.25 +    </li>
    7.26      </ul>
    7.27    </div>
    7.28    <div id="pageline"></div>
    7.29  </div>
    7.30  
    7.31 +<h2>Summary</h2>
    7.32 +
    7.33 +<p>...</p>
    7.34 +
    7.35 +<hr />
    7.36 +
    7.37 +<h2>Shortlog</h2>
    7.38 +
    7.39 +<table>
    7.40 +  <tbody>
    7.41 +{shortlog}
    7.42 +  </tbody>
    7.43 +</table>
    7.44 +
    7.45  {footer}