# HG changeset patch # User Marcin Kuzminski # Date 2010-06-30 15:05:20 # Node ID 46b7d108ea7a8c809534a0344dd436736bbf37e8 # Parent 81e18dc718c73883c3241f443444e5deef51b590 made graphg ticker, and fixes a paging bug caused grapgh disaligment diff --git a/pylons_app/controllers/changelog.py b/pylons_app/controllers/changelog.py --- a/pylons_app/controllers/changelog.py +++ b/pylons_app/controllers/changelog.py @@ -72,7 +72,7 @@ class ChangelogController(BaseController if not repo.revisions:return dumps([]), 0 max_rev = repo.revisions[-1] - offset = 1 if p == 1 else ((p - 1) * revcount) + offset = 1 if p == 1 else ((p - 1) * revcount + 1) rev_start = repo.revisions[(-1 * offset)] revcount = min(max_rev, revcount) diff --git a/pylons_app/public/css/monoblue_custom.css b/pylons_app/public/css/monoblue_custom.css --- a/pylons_app/public/css/monoblue_custom.css +++ b/pylons_app/public/css/monoblue_custom.css @@ -742,9 +742,6 @@ p.files { } /** end of changeset **/ /** canvas **/ -#graph_nodes { - margin-top: 8px; -} #graph { overflow: hidden; @@ -753,6 +750,8 @@ p.files { #graph_nodes { width: 160px; float: left; + margin-left:-50px; + margin-top: 5px; } #graph_content { @@ -774,7 +773,8 @@ p.files { border-bottom: 1px solid #CCCCCC; border-left: 1px solid #CCCCCC; border-right: 1px solid #CCCCCC; - height: 120px; + min-height: 80px; + overflow: hidden; } #graph_content .container .left { diff --git a/pylons_app/public/js/graph.js b/pylons_app/public/js/graph.js --- a/pylons_app/public/js/graph.js +++ b/pylons_app/public/js/graph.js @@ -1,5 +1,6 @@ // branch_renderer.js - Rendering of branch DAGs on the client side // +// Copyright 2010 Marcin Kuzminski // Copyright 2008 Jesper Noehr // Copyright 2008 Dirkjan Ochtman // Copyright 2006 Alexander Schremmer @@ -32,7 +33,8 @@ function BranchRenderer() { this.ctx.fillStyle = 'rgb(0, 0, 0)'; this.cur = [0, 0]; this.max_column = 1; - this.line_width = 3; + this.line_width = 2.5; + this.dot_radius = 5.5; this.bg = [0, 4]; this.cell = [2, 0]; this.revlink = ''; @@ -60,7 +62,7 @@ function BranchRenderer() { var idx = 1; var rela = document.getElementById('graph'); var pad = 160; - var scale = 20; + var scale = 22; for (var i in data) { this.scale(scale); @@ -102,20 +104,21 @@ function BranchRenderer() { y = row.offsetTop-rela.offsetTop+4; x = pad-((this.cell[0] + this.box_size * start - 1) + this.bg_height-2); + this.ctx.lineWidth=this.line_width; this.ctx.beginPath(); this.ctx.moveTo(x, y); //i don't know why it's +1 just fixes some drawing graph. y += row.clientHeight+1; x = pad-((1 + this.box_size * end) + this.bg_height-2); - this.ctx.lineTo(x,y+extra); + this.ctx.lineTo(x,y+extra,3); this.ctx.stroke(); } column = node[0] color = node[1] - radius = 4; + radius = this.dot_radius; y = row.offsetTop-rela.offsetTop+4; x = pad-(Math.round(this.cell[0] * scale/2 * column + radius) + 15 - (column*4)); diff --git a/pylons_app/templates/changelog/changelog.html b/pylons_app/templates/changelog/changelog.html --- a/pylons_app/templates/changelog/changelog.html +++ b/pylons_app/templates/changelog/changelog.html @@ -42,17 +42,17 @@
${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}
+ + ${cs.branch} + %for tag in cs.tags: + ${tag} + %endfor +
${cs.author}
${h.link_to(h.wrap_paragraphs(cs.message), h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}
- - ${cs.branch} - %for tag in cs.tags: - ${tag} - %endfor -