# HG changeset patch
# User Aras Pranckevicius <aras@unity3d.com>
# Date 1326094635 -7200
# Node ID 395a3196de73aeef5924494a1b0a946f7864d47d
# Parent  d832f2bbb466d1c388bf91bdfa74ab91f4d33c09# Parent  941dee1131365b6b8fd5e60c965546f55ba74faa
merge upstream (keeping my graph.js changes)

diff -r 941dee113136 -r 395a3196de73 rhodecode/public/css/style.css
--- a/rhodecode/public/css/style.css	Mon Jan 09 04:04:58 2012 +0200
+++ b/rhodecode/public/css/style.css	Mon Jan 09 09:37:15 2012 +0200
@@ -2314,18 +2314,11 @@
 	margin-top: 4px;
 }
 
-#graph_content .container .left .message {
-	font-size: 100%;
-	padding-top: 3px;
+#graph_content .container .mid .message {
 	white-space: pre-wrap;
-	border: 1px solid red;
-	position: relative;
-	top: -30px;
-	left: 40%;
-	width: 30%;
-}
-
-#graph_content .container .left .message a:hover{
+}
+
+#graph_content .container .mid .message a:hover{
 	text-decoration: none;
 }
 
diff -r 941dee113136 -r 395a3196de73 rhodecode/public/js/graph.js
--- a/rhodecode/public/js/graph.js	Mon Jan 09 04:04:58 2012 +0200
+++ b/rhodecode/public/js/graph.js	Mon Jan 09 09:37:15 2012 +0200
@@ -68,10 +68,7 @@
 			this.scale(scale);
 
 			var row = document.getElementById("chg_"+idx);
-			var	next = document.getElementById("chg_"+idx+1);
-			if(row == null){
-				continue
-			}
+			var	next = document.getElementById("chg_"+(idx+1));
 			var extra = 0;
 			
 			this.cell[1] += row.clientWidth;
@@ -82,7 +79,8 @@
 			node = cur[1];
 			in_l = cur[2];
 
-			var pos_ = 26;
+			var rowY = row.offsetTop + row.offsetHeight/2 - rela.offsetTop;
+			var nextY = (next == null) ? rowY + row.offsetHeight/2 : next.offsetTop + next.offsetHeight/2 - rela.offsetTop;
 
 			for (var j in in_l) {
 				
@@ -100,26 +98,25 @@
 				}
 				
 				this.setColor(color, 0.0, 0.65);
-				y = row.offsetTop-rela.offsetTop+pos_;
+
+				
 				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);
+				this.ctx.moveTo(x, rowY);
 
 				
 				if (start == end)
 				{
 					x = pad-((1 + this.box_size * end) + this.bg_height-2);
-					y += row.offsetHeight;
-					this.ctx.lineTo(x,y+extra,3);
+					this.ctx.lineTo(x,nextY+extra,3);
 				}
 				else
 				{
 					var x2 = pad-((1 + this.box_size * end) + this.bg_height-2);
-					var y2 = y + row.offsetHeight;
-					var ymid = (y+y2) / 2;
-					this.ctx.bezierCurveTo(x,ymid,x2,ymid,x2,y2);
+					var ymid = (rowY+nextY) / 2;
+					this.ctx.bezierCurveTo (x,ymid,x2,ymid,x2,nextY);
 				}
 				this.ctx.stroke();
 			}
@@ -128,12 +125,12 @@
 			color = node[1]
 			
 			radius = this.dot_radius;
-			y = row.offsetTop-rela.offsetTop+pos_;
+
 			x = pad-(Math.round(this.cell[0] * scale/2 * column + radius) + 15 - (column*4));
 		
 			this.ctx.beginPath();
 			this.setColor(color, 0.25, 0.75);
-			this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
+			this.ctx.arc(x, rowY, radius, 0, Math.PI * 2, true);
 			this.ctx.fill();
 			
 			idx++;
diff -r 941dee113136 -r 395a3196de73 rhodecode/templates/changelog/changelog.html