# HG changeset patch # User Paul Boddie # Date 1275605612 -7200 # Node ID d536199495b4449003243971189abfb83b8654e5 # Parent 975859cdcf2e9a3c91334a477c846efdee201f38 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. diff -r 975859cdcf2e -r d536199495b4 themes/mercurialweb/index.tmpl --- a/themes/mercurialweb/index.tmpl Thu Jun 03 23:33:25 2010 +0200 +++ b/themes/mercurialweb/index.tmpl Fri Jun 04 00:53:32 2010 +0200 @@ -1,5 +1,5 @@ {header} -Repository Index +Index of repositories diff -r 975859cdcf2e -r d536199495b4 themes/mercurialweb/map --- a/themes/mercurialweb/map Thu Jun 03 23:33:25 2010 +0200 +++ b/themes/mercurialweb/map Fri Jun 04 00:53:32 2010 +0200 @@ -5,9 +5,12 @@ footer = footer.tmpl index = index.tmpl indexentry = indexentry.tmpl +search = search.tmpl +searchentry = searchentry.tmpl shortlog = shortlog.tmpl shortlogentry = shortlogentry.tmpl summary = summary.tmpl +archiveentry = '{type|escape} ' +hiddenformentry = '' urlparameter = '{separator}{name}={value|urlescape}' -archiveentry = '{type|escape} ' diff -r 975859cdcf2e -r d536199495b4 themes/mercurialweb/search.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/search.tmpl Fri Jun 04 00:53:32 2010 +0200 @@ -0,0 +1,35 @@ +{header} +{repo|escape} (search) + + + + + + +

Results

+ + + +{entries} + +
+ +{footer} diff -r 975859cdcf2e -r d536199495b4 themes/mercurialweb/searchentry.tmpl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/themes/mercurialweb/searchentry.tmpl Fri Jun 04 00:53:32 2010 +0200 @@ -0,0 +1,6 @@ + + {date|age} ago + {author|person} + {desc|strip|firstline|escape} + files + diff -r 975859cdcf2e -r d536199495b4 themes/mercurialweb/shortlog.tmpl --- a/themes/mercurialweb/shortlog.tmpl Thu Jun 03 23:33:25 2010 +0200 +++ b/themes/mercurialweb/shortlog.tmpl Fri Jun 04 00:53:32 2010 +0200 @@ -1,5 +1,5 @@ {header} -Shortlog: {repo|escape} +{repo|escape} (shortlog) @@ -8,8 +8,15 @@
@@ -17,6 +24,8 @@
+

Shortlog

+ {entries%shortlogentry} diff -r 975859cdcf2e -r d536199495b4 themes/mercurialweb/static/style-mercurialweb.css --- a/themes/mercurialweb/static/style-mercurialweb.css Thu Jun 03 23:33:25 2010 +0200 +++ b/themes/mercurialweb/static/style-mercurialweb.css Fri Jun 04 00:53:32 2010 +0200 @@ -38,7 +38,7 @@ table { - margin: 1em; + margin: 0 1em 1em 1em; border-collapse: collapse; } @@ -102,6 +102,9 @@ #navibar a:hover, #navibar a:focus, #navibar li.current a, #navibar li.current span { background: #00b5f1; +} + +#navibar a:hover, #navibar a:focus, #navibar li.current a { text-decoration: none; } @@ -128,7 +131,12 @@ } #searchform { + display: inline; +} + +#searchform span.container { display: inline-block; + position: relative; /* Margin and padding correspond to the navibar settings. */ @@ -142,6 +150,22 @@ line-height: 42px; } +#searchform span.container span.hint { + display: none; +} + +#searchform span.container:hover span.hint { + display: block; + position: absolute; + top: 42px; + left: 16px; + + padding: 0 16px; + + background: #00b5f1; + color: #fff; +} + #searchform input { vertical-align: middle; } diff -r 975859cdcf2e -r d536199495b4 themes/mercurialweb/summary.tmpl --- a/themes/mercurialweb/summary.tmpl Thu Jun 03 23:33:25 2010 +0200 +++ b/themes/mercurialweb/summary.tmpl Fri Jun 04 00:53:32 2010 +0200 @@ -1,5 +1,5 @@ {header} -Summary: {repo|escape} +{repo|escape} (summary) @@ -8,10 +8,34 @@
+

Summary

+ +

...

+ +
+ +

Shortlog

+ +
+ +{shortlog} + +
+ {footer}