# HG changeset patch # User Dirkjan Ochtman # Date 2008-11-25 21:40:16 # Node ID b71ee3e00e81bbfcfcc193f53b39632bce148f6c # Parent f1111704061e0484d3f588e021b03683b427971e coal/paper: move actual templates from coal to paper diff --git a/templates/coal/changeset.tmpl b/templates/coal/changeset.tmpl deleted file mode 100644 --- a/templates/coal/changeset.tmpl +++ /dev/null @@ -1,70 +0,0 @@ -{header} -{repo|escape}: {node|short} - - -
- - -
- -

{repo|escape}

-

changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag}

- - - -
{desc|strip|escape|addbreaks}
- - - - - - - - - - - - - - - - - - - - - -
author{author|obfuscate}
date{date|date} ({date|age} ago)
parents{parent%changesetparent}
children{child%changesetchild}
files{files}
- -
-
line diff
- -{diff} -
- -
-
-{footer} diff --git a/templates/coal/error.tmpl b/templates/coal/error.tmpl deleted file mode 100644 --- a/templates/coal/error.tmpl +++ /dev/null @@ -1,42 +0,0 @@ -{header} -{repo|escape}: error - - - -
- - -
- -

{repo|escape}

-

error

- - - -
-

-An error occurred while processing your request: -

-

-{error|escape} -

-
-
-
- -{footer} diff --git a/templates/coal/fileannotate.tmpl b/templates/coal/fileannotate.tmpl deleted file mode 100644 --- a/templates/coal/fileannotate.tmpl +++ /dev/null @@ -1,78 +0,0 @@ -{header} -{repo|escape}: {file|escape} annotate - - - -
- - -
-

{repo|escape}

-

annotate {file|escape} @ {rev}:{node|short}

- - - -
{desc|strip|escape|addbreaks}
- - - - - - - - - - - - - - - - - - -{changesettag} -
author{author|obfuscate}
date{date|date} ({date|age} ago)
parents{parent%filerevparent}
children{child%filerevchild}
- -
- -
- - - - - -{annotate%annotateline} -
rev  line source
-
-
-
- -{footer} diff --git a/templates/coal/filediff.tmpl b/templates/coal/filediff.tmpl deleted file mode 100644 --- a/templates/coal/filediff.tmpl +++ /dev/null @@ -1,71 +0,0 @@ -{header} -{repo|escape}: {file|escape} diff - - - -
- - -
-

{repo|escape}

-

diff {file|escape} @ {rev}:{node|short}

- - - -
{desc|strip|escape|addbreaks}
- - - - - - - - - - - - - - - - - - -{changesettag} -
author{author|obfuscate}
date{date|date} ({date|age} ago)
parents{parent%filerevparent}
children{child%filerevchild}
- -
-
line diff
- -{diff} -
-
-
- -{footer} diff --git a/templates/coal/filelog.tmpl b/templates/coal/filelog.tmpl deleted file mode 100644 --- a/templates/coal/filelog.tmpl +++ /dev/null @@ -1,59 +0,0 @@ -{header} -{repo|escape}: {file|escape} history - - - - - -
- - -
-

{repo|escape}

-

log {file|escape}

- - - - - - - - - - - -{entries%filelogentry} -
ageauthordescription
- -
-
- -{footer} diff --git a/templates/coal/filelogentry.tmpl b/templates/coal/filelogentry.tmpl deleted file mode 100644 --- a/templates/coal/filelogentry.tmpl +++ /dev/null @@ -1,5 +0,0 @@ - - {date|age} - {author|person} - {desc|strip|firstline|escape}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag} - diff --git a/templates/coal/filerevision.tmpl b/templates/coal/filerevision.tmpl deleted file mode 100644 --- a/templates/coal/filerevision.tmpl +++ /dev/null @@ -1,71 +0,0 @@ -{header} -{repo|escape}: {node|short} {file|escape} - - - -
- - -
-

{repo|escape}

-

view {file|escape} @ {rev}:{node|short}

- - - -
{desc|strip|escape|addbreaks}
- - - - - - - - - - - - - - - - - - -{changesettag} -
author{author|obfuscate}
date{date|date} ({date|age} ago)
parents{parent%filerevparent}
children{child%filerevchild}
- -
-
line source
-{text%fileline} -
-
-
-
- -{footer} diff --git a/templates/coal/footer.tmpl b/templates/coal/footer.tmpl deleted file mode 100644 --- a/templates/coal/footer.tmpl +++ /dev/null @@ -1,4 +0,0 @@ -{motd} - - - diff --git a/templates/coal/graph.tmpl b/templates/coal/graph.tmpl deleted file mode 100644 --- a/templates/coal/graph.tmpl +++ /dev/null @@ -1,131 +0,0 @@ -{header} -{repo|escape}: revision graph - - - - - - -
- - -
-

{repo|escape}

-

graph

- - - - - - - -
-
    - -
      -
      - - - - - - -
      -
      - -{footer} diff --git a/templates/coal/index.tmpl b/templates/coal/index.tmpl deleted file mode 100644 --- a/templates/coal/index.tmpl +++ /dev/null @@ -1,26 +0,0 @@ -{header} -Mercurial repositories index - - - -
      - -
      -

      Mercurial Repositories

      - - - - - - - - - - {entries%indexentry} -
      NameDescriptionContactLast change 
      -
      -
      -{footer} diff --git a/templates/coal/manifest.tmpl b/templates/coal/manifest.tmpl deleted file mode 100644 --- a/templates/coal/manifest.tmpl +++ /dev/null @@ -1,53 +0,0 @@ -{header} -{repo|escape}: {node|short} {path|escape} - - - -
      - - -
      -

      {repo|escape}

      -

      directory {path|escape} @ {rev}:{node|short} {tags%changelogtag}

      - - - - - - - - - - - - - - -{dentries%direntry} -{fentries%fileentry} -
      namesizepermissions
      [up]drwxr-xr-x
      -
      -
      -{footer} diff --git a/templates/coal/map b/templates/coal/map --- a/templates/coal/map +++ b/templates/coal/map @@ -2,13 +2,13 @@ default = 'shortlog' mimetype = 'text/html; charset={encoding}' header = header.tmpl -footer = footer.tmpl -search = search.tmpl +footer = ../paper/footer.tmpl +search = ../paper/search.tmpl -changelog = shortlog.tmpl -shortlog = shortlog.tmpl -shortlogentry = shortlogentry.tmpl -graph = graph.tmpl +changelog = ../paper/shortlog.tmpl +shortlog = ../paper/shortlog.tmpl +shortlogentry = ../paper/shortlogentry.tmpl +graph = ../paper/graph.tmpl naventry = '{label|escape} ' navshortentry = '{label|escape} ' @@ -18,20 +18,20 @@ filedifflink = '{file|escape} ' filenolink = '{file|escape} ' fileellipses = '...' -changelogentry = shortlogentry.tmpl -searchentry = shortlogentry.tmpl -changeset = changeset.tmpl -manifest = manifest.tmpl +changelogentry = ../paper/shortlogentry.tmpl +searchentry = ../paper/shortlogentry.tmpl +changeset = ../paper/changeset.tmpl +manifest = ../paper/manifest.tmpl direntry = ' {basename|escape}/ {emptydirs|escape}drwxr-xr-x' fileentry = ' {basename|escape}{size}{permissions|permissions}' -filerevision = filerevision.tmpl -fileannotate = fileannotate.tmpl -filediff = filediff.tmpl -filelog = filelog.tmpl +filerevision = ../paper/filerevision.tmpl +fileannotate = ../paper/fileannotate.tmpl +filediff = ../paper/filediff.tmpl +filelog = ../paper/filelog.tmpl fileline = '
      {linenumber} {line|escape}
      ' -filelogentry = filelogentry.tmpl +filelogentry = ../paper/filelogentry.tmpl annotateline = '{author|user}@{rev}{linenumber} {line|escape}' @@ -54,7 +54,7 @@ fileannotateparent = '{node|short}' changelogchild = 'child{node|short}' fileannotatechild = 'child:{node|short}' -tags = tags.tmpl +tags = ../paper/tags.tmpl tagentry = '{tag|escape}{node|short}' changelogtag = '{name|escape} ' changesettag = '{tag|escape} ' @@ -66,9 +66,9 @@ filediffchild = 'c filelogchild = 'child {rev}:{node|short}' indexentry = '{name|escape}{description}{contact|obfuscate}{lastchange|age} ago{archives%indexarchiveentry}\n' indexarchiveentry = ' ↓{type|escape}' -index = index.tmpl +index = ../paper/index.tmpl archiveentry = '
    • {type|escape}
    • ' -notfound = notfound.tmpl -error = error.tmpl +notfound = ../paper/notfound.tmpl +error = ../paper/error.tmpl urlparameter = '{separator}{name}={value|urlescape}' hiddenformentry = '' diff --git a/templates/coal/notfound.tmpl b/templates/coal/notfound.tmpl deleted file mode 100644 --- a/templates/coal/notfound.tmpl +++ /dev/null @@ -1,12 +0,0 @@ -{header} -Mercurial repository not found - - - -

      Mercurial repository not found

      - -The specified repository "{repo|escape}" is unknown, sorry. - -Please go back to the main repository list page. - -{footer} diff --git a/templates/coal/search.tmpl b/templates/coal/search.tmpl deleted file mode 100644 --- a/templates/coal/search.tmpl +++ /dev/null @@ -1,42 +0,0 @@ -{header} -{repo|escape}: searching for {query|escape} - - - -
      - - -
      -

      {repo|escape}

      -

      searching for '{query|escape}'

      - - - - - - - - - -{entries} -
      ageauthordescription
      - -
      -
      - -{footer} diff --git a/templates/coal/shortlog.tmpl b/templates/coal/shortlog.tmpl deleted file mode 100644 --- a/templates/coal/shortlog.tmpl +++ /dev/null @@ -1,56 +0,0 @@ -{header} -{repo|escape}: log - - - - - -
      - - -
      -

      {repo|escape}

      -

      log

      - - - - - - - - - - - -{entries%shortlogentry} -
      ageauthordescription
      - - -
      -
      - -{footer} diff --git a/templates/coal/shortlogentry.tmpl b/templates/coal/shortlogentry.tmpl deleted file mode 100644 --- a/templates/coal/shortlogentry.tmpl +++ /dev/null @@ -1,5 +0,0 @@ - - {date|age} - {author|person} - {desc|strip|firstline|escape}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag} - diff --git a/templates/coal/tags.tmpl b/templates/coal/tags.tmpl deleted file mode 100644 --- a/templates/coal/tags.tmpl +++ /dev/null @@ -1,44 +0,0 @@ -{header} -{repo|escape}: tags - - - - - -
      - - -
      -

      {repo|escape}

      -

      tags

      - - - - - - - - -{entries%tagentry} -
      tagnode
      -
      -
      - -{footer} diff --git a/templates/paper/changeset.tmpl b/templates/paper/changeset.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/changeset.tmpl @@ -0,0 +1,70 @@ +{header} +{repo|escape}: {node|short} + + +
      + + +
      + +

      {repo|escape}

      +

      changeset {rev}:{node|short} {changesetbranch%changelogbranchname} {changesettag}

      + + + +
      {desc|strip|escape|addbreaks}
      + + + + + + + + + + + + + + + + + + + + + +
      author{author|obfuscate}
      date{date|date} ({date|age} ago)
      parents{parent%changesetparent}
      children{child%changesetchild}
      files{files}
      + +
      +
      line diff
      + +{diff} +
      + +
      +
      +{footer} diff --git a/templates/paper/error.tmpl b/templates/paper/error.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/error.tmpl @@ -0,0 +1,42 @@ +{header} +{repo|escape}: error + + + +
      + + +
      + +

      {repo|escape}

      +

      error

      + + + +
      +

      +An error occurred while processing your request: +

      +

      +{error|escape} +

      +
      +
      +
      + +{footer} diff --git a/templates/paper/fileannotate.tmpl b/templates/paper/fileannotate.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/fileannotate.tmpl @@ -0,0 +1,78 @@ +{header} +{repo|escape}: {file|escape} annotate + + + +
      + + +
      +

      {repo|escape}

      +

      annotate {file|escape} @ {rev}:{node|short}

      + + + +
      {desc|strip|escape|addbreaks}
      + + + + + + + + + + + + + + + + + + +{changesettag} +
      author{author|obfuscate}
      date{date|date} ({date|age} ago)
      parents{parent%filerevparent}
      children{child%filerevchild}
      + +
      + +
      + + + + + +{annotate%annotateline} +
      rev  line source
      +
      +
      +
      + +{footer} diff --git a/templates/paper/filediff.tmpl b/templates/paper/filediff.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/filediff.tmpl @@ -0,0 +1,71 @@ +{header} +{repo|escape}: {file|escape} diff + + + +
      + + +
      +

      {repo|escape}

      +

      diff {file|escape} @ {rev}:{node|short}

      + + + +
      {desc|strip|escape|addbreaks}
      + + + + + + + + + + + + + + + + + + +{changesettag} +
      author{author|obfuscate}
      date{date|date} ({date|age} ago)
      parents{parent%filerevparent}
      children{child%filerevchild}
      + +
      +
      line diff
      + +{diff} +
      +
      +
      + +{footer} diff --git a/templates/paper/filelog.tmpl b/templates/paper/filelog.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/filelog.tmpl @@ -0,0 +1,59 @@ +{header} +{repo|escape}: {file|escape} history + + + + + +
      + + +
      +

      {repo|escape}

      +

      log {file|escape}

      + + + + + + + + + + + +{entries%filelogentry} +
      ageauthordescription
      + +
      +
      + +{footer} diff --git a/templates/paper/filelogentry.tmpl b/templates/paper/filelogentry.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/filelogentry.tmpl @@ -0,0 +1,5 @@ + + {date|age} + {author|person} + {desc|strip|firstline|escape}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag} + diff --git a/templates/paper/filerevision.tmpl b/templates/paper/filerevision.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/filerevision.tmpl @@ -0,0 +1,71 @@ +{header} +{repo|escape}: {node|short} {file|escape} + + + +
      + + +
      +

      {repo|escape}

      +

      view {file|escape} @ {rev}:{node|short}

      + + + +
      {desc|strip|escape|addbreaks}
      + + + + + + + + + + + + + + + + + + +{changesettag} +
      author{author|obfuscate}
      date{date|date} ({date|age} ago)
      parents{parent%filerevparent}
      children{child%filerevchild}
      + +
      +
      line source
      +{text%fileline} +
      +
      +
      +
      + +{footer} diff --git a/templates/paper/footer.tmpl b/templates/paper/footer.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/footer.tmpl @@ -0,0 +1,4 @@ +{motd} + + + diff --git a/templates/paper/graph.tmpl b/templates/paper/graph.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/graph.tmpl @@ -0,0 +1,131 @@ +{header} +{repo|escape}: revision graph + + + + + + +
      + + +
      +

      {repo|escape}

      +

      graph

      + + + + + + + +
      +
        + +
          +
          + + + + + + +
          +
          + +{footer} diff --git a/templates/paper/index.tmpl b/templates/paper/index.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/index.tmpl @@ -0,0 +1,26 @@ +{header} +Mercurial repositories index + + + +
          + +
          +

          Mercurial Repositories

          + + + + + + + + + + {entries%indexentry} +
          NameDescriptionContactLast change 
          +
          +
          +{footer} diff --git a/templates/paper/manifest.tmpl b/templates/paper/manifest.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/manifest.tmpl @@ -0,0 +1,53 @@ +{header} +{repo|escape}: {node|short} {path|escape} + + + +
          + + +
          +

          {repo|escape}

          +

          directory {path|escape} @ {rev}:{node|short} {tags%changelogtag}

          + + + + + + + + + + + + + + +{dentries%direntry} +{fentries%fileentry} +
          namesizepermissions
          [up]drwxr-xr-x
          +
          +
          +{footer} diff --git a/templates/paper/map b/templates/paper/map --- a/templates/paper/map +++ b/templates/paper/map @@ -2,13 +2,13 @@ default = 'shortlog' mimetype = 'text/html; charset={encoding}' header = header.tmpl -footer = ../coal/footer.tmpl -search = ../coal/search.tmpl +footer = footer.tmpl +search = search.tmpl -changelog = ../coal/shortlog.tmpl -shortlog = ../coal/shortlog.tmpl -shortlogentry = ../coal/shortlogentry.tmpl -graph = ../coal/graph.tmpl +changelog = shortlog.tmpl +shortlog = shortlog.tmpl +shortlogentry = shortlogentry.tmpl +graph = graph.tmpl naventry = '{label|escape} ' navshortentry = '{label|escape} ' @@ -18,20 +18,20 @@ filedifflink = '{file|escape} ' filenolink = '{file|escape} ' fileellipses = '...' -changelogentry = ../coal/shortlogentry.tmpl -searchentry = ../coal/shortlogentry.tmpl -changeset = ../coal/changeset.tmpl -manifest = ../coal/manifest.tmpl +changelogentry = shortlogentry.tmpl +searchentry = shortlogentry.tmpl +changeset = changeset.tmpl +manifest = manifest.tmpl direntry = ' {basename|escape}/ {emptydirs|escape}drwxr-xr-x' fileentry = ' {basename|escape}{size}{permissions|permissions}' -filerevision = ../coal/filerevision.tmpl -fileannotate = ../coal/fileannotate.tmpl -filediff = ../coal/filediff.tmpl -filelog = ../coal/filelog.tmpl +filerevision = filerevision.tmpl +fileannotate = fileannotate.tmpl +filediff = filediff.tmpl +filelog = filelog.tmpl fileline = '
          {linenumber} {line|escape}
          ' -filelogentry = ../coal/filelogentry.tmpl +filelogentry = filelogentry.tmpl annotateline = '{author|user}@{rev}{linenumber} {line|escape}' @@ -54,7 +54,7 @@ fileannotateparent = '{node|short}' changelogchild = 'child{node|short}' fileannotatechild = 'child:{node|short}' -tags = ../coal/tags.tmpl +tags = tags.tmpl tagentry = '{tag|escape}{node|short}' changelogtag = '{name|escape} ' changesettag = '{tag|escape} ' @@ -66,9 +66,9 @@ filediffchild = 'c filelogchild = 'child {rev}:{node|short}' indexentry = '{name|escape}{description}{contact|obfuscate}{lastchange|age} ago{archives%indexarchiveentry}\n' indexarchiveentry = ' ↓{type|escape}' -index = ../coal/index.tmpl +index = index.tmpl archiveentry = '
        • {type|escape}
        • ' -notfound = ../coal/notfound.tmpl -error = ../coal/error.tmpl +notfound = notfound.tmpl +error = error.tmpl urlparameter = '{separator}{name}={value|urlescape}' hiddenformentry = '' diff --git a/templates/paper/notfound.tmpl b/templates/paper/notfound.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/notfound.tmpl @@ -0,0 +1,12 @@ +{header} +Mercurial repository not found + + + +

          Mercurial repository not found

          + +The specified repository "{repo|escape}" is unknown, sorry. + +Please go back to the main repository list page. + +{footer} diff --git a/templates/paper/search.tmpl b/templates/paper/search.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/search.tmpl @@ -0,0 +1,42 @@ +{header} +{repo|escape}: searching for {query|escape} + + + +
          + + +
          +

          {repo|escape}

          +

          searching for '{query|escape}'

          + + + + + + + + + +{entries} +
          ageauthordescription
          + +
          +
          + +{footer} diff --git a/templates/paper/shortlog.tmpl b/templates/paper/shortlog.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/shortlog.tmpl @@ -0,0 +1,56 @@ +{header} +{repo|escape}: log + + + + + +
          + + +
          +

          {repo|escape}

          +

          log

          + + + + + + + + + + + +{entries%shortlogentry} +
          ageauthordescription
          + + +
          +
          + +{footer} diff --git a/templates/paper/shortlogentry.tmpl b/templates/paper/shortlogentry.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/shortlogentry.tmpl @@ -0,0 +1,5 @@ + + {date|age} + {author|person} + {desc|strip|firstline|escape}{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag} + diff --git a/templates/paper/tags.tmpl b/templates/paper/tags.tmpl new file mode 100644 --- /dev/null +++ b/templates/paper/tags.tmpl @@ -0,0 +1,44 @@ +{header} +{repo|escape}: tags + + + + + +
          + + +
          +

          {repo|escape}

          +

          tags

          + + + + + + + + +{entries%tagentry} +
          tagnode
          +
          +
          + +{footer}