diff --git a/templates/changelog.tmpl b/templates/changelog.tmpl --- a/templates/changelog.tmpl +++ b/templates/changelog.tmpl @@ -9,6 +9,7 @@
shortlog +graph tags files #archives%archiveentry# diff --git a/templates/changeset.tmpl b/templates/changeset.tmpl --- a/templates/changeset.tmpl +++ b/templates/changeset.tmpl @@ -6,6 +6,7 @@
changelog shortlog +graph tags files raw diff --git a/templates/fileannotate.tmpl b/templates/fileannotate.tmpl --- a/templates/fileannotate.tmpl +++ b/templates/fileannotate.tmpl @@ -6,6 +6,7 @@
changelog shortlog +graph tags changeset files diff --git a/templates/filediff.tmpl b/templates/filediff.tmpl --- a/templates/filediff.tmpl +++ b/templates/filediff.tmpl @@ -6,6 +6,7 @@
changelog shortlog +graph tags changeset file diff --git a/templates/filelog.tmpl b/templates/filelog.tmpl --- a/templates/filelog.tmpl +++ b/templates/filelog.tmpl @@ -11,6 +11,7 @@
changelog shortlog +graph tags file annotate diff --git a/templates/filerevision.tmpl b/templates/filerevision.tmpl --- a/templates/filerevision.tmpl +++ b/templates/filerevision.tmpl @@ -6,6 +6,7 @@
changelog shortlog +graph tags changeset files diff --git a/templates/gitweb/changelog.tmpl b/templates/gitweb/changelog.tmpl --- a/templates/gitweb/changelog.tmpl +++ b/templates/gitweb/changelog.tmpl @@ -19,7 +19,12 @@ diff --git a/templates/gitweb/changeset.tmpl b/templates/gitweb/changeset.tmpl --- a/templates/gitweb/changeset.tmpl +++ b/templates/gitweb/changeset.tmpl @@ -12,7 +12,7 @@
diff --git a/templates/gitweb/fileannotate.tmpl b/templates/gitweb/fileannotate.tmpl --- a/templates/gitweb/fileannotate.tmpl +++ b/templates/gitweb/fileannotate.tmpl @@ -15,6 +15,7 @@ summary | shortlog | changelog | +graph | tags | files | changeset | diff --git a/templates/gitweb/filediff.tmpl b/templates/gitweb/filediff.tmpl --- a/templates/gitweb/filediff.tmpl +++ b/templates/gitweb/filediff.tmpl @@ -15,6 +15,7 @@ summary | shortlog | changelog | +graph | tags | files | changeset | diff --git a/templates/gitweb/filelog.tmpl b/templates/gitweb/filelog.tmpl --- a/templates/gitweb/filelog.tmpl +++ b/templates/gitweb/filelog.tmpl @@ -15,6 +15,7 @@ summary | shortlog | changelog | +graph | tags | file | revisions | diff --git a/templates/gitweb/filerevision.tmpl b/templates/gitweb/filerevision.tmpl --- a/templates/gitweb/filerevision.tmpl +++ b/templates/gitweb/filerevision.tmpl @@ -15,6 +15,7 @@ summary | shortlog | changelog | +graph | tags | files | changeset | diff --git a/templates/gitweb/graph.tmpl b/templates/gitweb/graph.tmpl new file mode 100644 --- /dev/null +++ b/templates/gitweb/graph.tmpl @@ -0,0 +1,113 @@ +#header# +#repo|escape#: Shortlog + + + + + + + +
+{sessionvars%hiddenformentry} + +
+ + +
 
+ +
The revision graph only works with JavaScript-enabled browsers.
+ +
+
    + +
      +
      + + + + + + +#footer# diff --git a/templates/gitweb/manifest.tmpl b/templates/gitweb/manifest.tmpl --- a/templates/gitweb/manifest.tmpl +++ b/templates/gitweb/manifest.tmpl @@ -15,6 +15,7 @@ summary | shortlog | changelog | +graph | tags | files | changeset #archives%archiveentry#
      diff --git a/templates/gitweb/map b/templates/gitweb/map --- a/templates/gitweb/map +++ b/templates/gitweb/map @@ -50,6 +50,7 @@ filelogparent = 'p filediffchild = 'child {rev}{node|short}' filelogchild = 'child #rev#: #node|short#' shortlog = shortlog.tmpl +graph = graph.tmpl tagtag = '{name} ' branchtag = '{name} ' inbranchtag = '{name} ' diff --git a/templates/gitweb/search.tmpl b/templates/gitweb/search.tmpl --- a/templates/gitweb/search.tmpl +++ b/templates/gitweb/search.tmpl @@ -22,6 +22,7 @@ summary | shortlog | changelog | +graph | tags | files#archives%archiveentry#
      diff --git a/templates/gitweb/shortlog.tmpl b/templates/gitweb/shortlog.tmpl --- a/templates/gitweb/shortlog.tmpl +++ b/templates/gitweb/shortlog.tmpl @@ -21,6 +21,7 @@ summary | shortlog | changelog | +graph | tags | files#archives%archiveentry#
      diff --git a/templates/gitweb/summary.tmpl b/templates/gitweb/summary.tmpl --- a/templates/gitweb/summary.tmpl +++ b/templates/gitweb/summary.tmpl @@ -22,6 +22,7 @@ summary | shortlog | changelog | +graph | tags | files#archives%archiveentry#
      diff --git a/templates/gitweb/tags.tmpl b/templates/gitweb/tags.tmpl --- a/templates/gitweb/tags.tmpl +++ b/templates/gitweb/tags.tmpl @@ -15,6 +15,7 @@ summary | shortlog | changelog | +graph | tags | files
      diff --git a/templates/graph.tmpl b/templates/graph.tmpl new file mode 100644 --- /dev/null +++ b/templates/graph.tmpl @@ -0,0 +1,95 @@ +#header# +#repo|escape#: graph + + + + + + + +

      graph

      + +
      +{sessionvars%hiddenformentry} +

      + + +navigate: #changenav%navshortentry# +

      +
      + +
      The revision graph only works with JavaScript-enabled browsers.
      + +
      +
        + +
          +
          + + + + +
          + +less +more +| {changenav%navshortentry} + + +#footer# diff --git a/templates/manifest.tmpl b/templates/manifest.tmpl --- a/templates/manifest.tmpl +++ b/templates/manifest.tmpl @@ -6,6 +6,7 @@
          changelog shortlog +graph tags changeset #archives%archiveentry# diff --git a/templates/map b/templates/map --- a/templates/map +++ b/templates/map @@ -6,6 +6,7 @@ search = search.tmpl changelog = changelog.tmpl shortlog = shortlog.tmpl shortlogentry = shortlogentry.tmpl +graph = graph.tmpl naventry = '{label|escape} ' navshortentry = '{label|escape} ' filenaventry = '{label|escape} ' diff --git a/templates/paper/map b/templates/paper/map --- a/templates/paper/map +++ b/templates/paper/map @@ -8,6 +8,7 @@ search = ../coal/search.tmpl changelog = ../coal/shortlog.tmpl shortlog = ../coal/shortlog.tmpl shortlogentry = ../coal/shortlogentry.tmpl +graph = ../coal/graph.tmpl naventry = '{label|escape} ' navshortentry = '{label|escape} ' diff --git a/templates/search.tmpl b/templates/search.tmpl --- a/templates/search.tmpl +++ b/templates/search.tmpl @@ -6,6 +6,7 @@
          changelog shortlog +graph tags files #archives%archiveentry# diff --git a/templates/shortlog.tmpl b/templates/shortlog.tmpl --- a/templates/shortlog.tmpl +++ b/templates/shortlog.tmpl @@ -9,6 +9,7 @@
          changelog +graph tags files #archives%archiveentry# diff --git a/templates/static/style-gitweb.css b/templates/static/style-gitweb.css --- a/templates/static/style-gitweb.css +++ b/templates/static/style-gitweb.css @@ -79,3 +79,44 @@ span.logtags span.inbranchtag { background-color: #d5dde6; border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4; } + +/* Graph */ +div#wrapper { + position: relative; + margin: 0; + padding: 0; +} + +canvas { + position: absolute; + z-index: 5; + top: -0.9em; + margin: 0; +} + +ul#nodebgs { + list-style: none inside none; + padding: 0; + margin: 0; + top: -0.7em; +} + +ul#graphnodes li, ul#nodebgs li { + height: 39px; +} + +ul#graphnodes { + position: absolute; + z-index: 10; + top: -0.8em; + list-style: none inside none; + padding: 0; +} + +ul#graphnodes li .info { + display: block; + font-size: 100%; + position: relative; + top: -3px; + font-style: italic; +} diff --git a/templates/static/style-paper.css b/templates/static/style-paper.css --- a/templates/static/style-paper.css +++ b/templates/static/style-paper.css @@ -150,3 +150,45 @@ div.description { margin: 1em 0 1em 0; padding: .3em; } + +/* Graph */ +div#wrapper { + position: relative; + border-top: 1px solid black; + border-bottom: 1px solid black; + margin: 0; + padding: 0; +} + +canvas { + position: absolute; + z-index: 5; + top: -0.7em; + margin: 0; +} + +ul#nodebgs { + list-style: none inside none; + padding: 0; + margin: 0; + top: -0.7em; +} + +ul#graphnodes li, ul#nodebgs li { + height: 39px; +} + +ul#graphnodes { + position: absolute; + z-index: 10; + top: -1.0em; + list-style: none inside none; + padding: 0; +} + +ul#graphnodes li .info { + display: block; + font-size: 70%; + position: relative; + top: -3px; +} diff --git a/templates/static/style.css b/templates/static/style.css --- a/templates/static/style.css +++ b/templates/static/style.css @@ -64,3 +64,42 @@ pre { margin: 0; } #filediffEntry { } #filediffEntry th { font-weight: normal; background-color: #888; color: #fff; text-align: right; } +/* Graph */ +div#wrapper { + position: relative; + margin: 0; + padding: 0; +} + +canvas { + position: absolute; + z-index: 5; + top: -0.6em; + margin: 0; +} + +ul#nodebgs { + list-style: none inside none; + padding: 0; + margin: 0; + top: -0.7em; +} + +ul#graphnodes li, ul#nodebgs li { + height: 39px; +} + +ul#graphnodes { + position: absolute; + z-index: 10; + top: -0.85em; + list-style: none inside none; + padding: 0; +} + +ul#graphnodes li .info { + display: block; + font-size: 70%; + position: relative; + top: -1px; +} diff --git a/templates/tags.tmpl b/templates/tags.tmpl --- a/templates/tags.tmpl +++ b/templates/tags.tmpl @@ -10,6 +10,7 @@