1.1 --- a/themes/mercurialweb/map	Thu Apr 28 21:47:11 2016 +0200
     1.2 +++ b/themes/mercurialweb/map	Thu Apr 28 23:01:51 2016 +0200
     1.3 @@ -22,7 +22,6 @@
     1.4  summary = summary.tmpl
     1.5  tags = tags.tmpl
     1.6  
     1.7 -annotateline = annotateline.tmpl
     1.8  bookmarkentry = bookmarkentry.tmpl
     1.9  branchentry = branchentry.tmpl
    1.10  changelogentry = changelogentry.tmpl
    1.11 @@ -42,35 +41,37 @@
    1.12  graphpagerentry = '{before%graphpagerlink}{after%graphpagerlink}'
    1.13  shortlogpagerentry = '{before%shortlogpagerlink}{after%shortlogpagerlink}'
    1.14  
    1.15 +annotateline = '<tr class="annotate"> <td class="annotate"><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}" title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a></td> <td class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a></td> <td class="source"><pre>{line|escape}</pre></td> </tr>'
    1.16 +
    1.17  annotatelink = '<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    1.18 -archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|xmlescape}</a> '
    1.19 +archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a> '
    1.20  bookmarktag = '<span class="bookmark"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
    1.21  branchlabel = '<span class="branch">{name}</span> '
    1.22  branchtag = '<span class="branch"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
    1.23 -changelogpagerlink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
    1.24 +changelogpagerlink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
    1.25  changeloglink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{rev}:{node|short}</a> '
    1.26  changesetlink = '<a href="{url}rev/{node|short}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    1.27  changesetfiledifflink = '<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    1.28  filerevlink = '<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
    1.29 -graphpagerlink = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
    1.30 +graphpagerlink = '<a href="{url}graph/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
    1.31  inbranchlabel = '<span class="inbranch">{name}</span> '
    1.32  inbranchtag = '<span class="inbranch"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
    1.33 -shortlogpagerlink = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
    1.34 +shortlogpagerlink = '<a href="{url}shortlog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|escape}</a> '
    1.35  tagtag = '<span class="tag">{name}</span> '
    1.36  
    1.37  diffblock = '<div id="diff{blockno}" class="source"><pre>{lines}</pre></div>'
    1.38 -difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|xmlescape}</span>'
    1.39 -difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|xmlescape}</span>'
    1.40 -difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|xmlescape}</span>'
    1.41 -diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|xmlescape}'
    1.42 +difflineplus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="plusline">{line|escape}</span>'
    1.43 +difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="minusline">{line|escape}</span>'
    1.44 +difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>'
    1.45 +diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}'
    1.46  
    1.47 -filedifflink = '<span><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|xmlescape}</a></span> '
    1.48 +filedifflink = '<span><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{file|escape}</a></span> '
    1.49  fileellipses = '...'
    1.50  
    1.51 -fileline = '<span class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|xmlescape}</span>'
    1.52 +fileline = '<span class="line"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>'
    1.53  
    1.54 -filenolink = '<span>{file|xmlescape}</span> '
    1.55 -filenodelink = '<span><a href="{url}rev/{node|short}{sessionvars%urlparameter}#diff{blockno}">{file|xmlescape}</a> <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(file)</a></span> '
    1.56 +filenolink = '<span>{file|escape}</span> '
    1.57 +filenodelink = '<span><a href="{url}rev/{node|short}{sessionvars%urlparameter}#diff{blockno}">{file|escape}</a> <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">(file)</a></span> '
    1.58  
    1.59  hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
    1.60  urlparameter = '{separator}{name}={value|urlescape}'