kallithea Changeset - a0287ee1fd87

Changeset - a0287ee1fd87

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 14 years ago 2011-11-05 00:57:51
marcin@python-works.com

fixes for DAG renderer on chrome

2 files changed with 4 insertions and 3 deletions:

rhodecode/public/css/style.css

rhodecode/public/js/graph.js

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1714,385 +1714,385 @@ div.form div.fields div.field div.button @@
 	padding-left: 38px;
+}
 #journal .journal_user {
 	color: #747474;
 	font-size: 14px;
 	font-weight: bold;
 	height: 30px;
+}
 #journal .journal_icon {
 	clear: both;
 	float: left;
 	padding-right: 4px;
 	padding-top: 3px;
+}
 #journal .journal_action {
 	padding-top: 4px;
 	min-height: 2px;
 	float: left
+}
 #journal .journal_action_params {
 	clear: left;
 	padding-left: 22px;
+}
 #journal .journal_repo {
 	float: left;
 	margin-left: 6px;
 	padding-top: 3px;
+}
 #journal .date {
 	clear: both;
 	color: #777777;
 	font-size: 11px;
 	padding-left: 22px;
+}
 #journal .journal_repo .journal_repo_name {
 	font-weight: bold;
 	font-size: 1.1em;
+}
 #journal .compare_view {
 	padding: 5px 0px 5px 0px;
 	width: 95px;
+}
 .journal_highlight {
 	font-weight: bold;
 	padding: 0 2px;
 	vertical-align: bottom;
+}
 .trending_language_tbl,.trending_language_tbl td {
 	border: 0 !important;
 	margin: 0 !important;
 	padding: 0 !important;
+}
 .trending_language {
 	background-color: #003367;
 	color: #FFF;
 	display: block;
 	min-width: 20px;
 	text-decoration: none;
 	height: 12px;
 	margin-bottom: 4px;
 	margin-left: 5px;
 	white-space: pre;
 	padding: 3px;
+}
 h3.files_location {
 	font-size: 1.8em;
 	font-weight: 700;
 	border-bottom: none !important;
 	margin: 10px 0 !important;
+}
 #files_data dl dt {
 	float: left;
 	width: 115px;
 	margin: 0 !important;
 	padding: 5px;
+}
 #files_data dl dd {
 	margin: 0 !important;
 	padding: 5px !important;
+}
 #changeset_content {
 	border: 1px solid #CCC;
 	padding: 5px;
+}
 #changeset_compare_view_content {
 	border: 1px solid #CCC;
 	padding: 5px;
+}
 #changeset_content .container {
 	min-height: 120px;
 	font-size: 1.2em;
 	overflow: hidden;
+}
 #changeset_compare_view_content .compare_view_commits {
 	width: auto !important;
+}
 #changeset_compare_view_content .compare_view_commits td {
 	padding: 0px 0px 0px 12px !important;
+}
 #changeset_content .container .right {
 	float: right;
 	width: 25%;
 	text-align: right;
+}
 #changeset_content .container .left .message {
 	font-style: italic;
 	color: #556CB5;
 	white-space: pre-wrap;
+}
 .cs_files .cur_cs {
 	margin: 10px 2px;
 	font-weight: bold;
+}
 .cs_files .node {
 	float: left;
+}
 .cs_files .changes {
 	float: right;
+}
 .cs_files .changes .added {
 	background-color: #BBFFBB;
 	float: left;
 	text-align: center;
 	font-size: 90%;
+}
 .cs_files .changes .deleted {
 	background-color: #FF8888;
 	float: left;
 	text-align: center;
 	font-size: 90%;
+}
 .cs_files .cs_added {
 	background: url("../images/icons/page_white_add.png") no-repeat scroll
 px;
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 .cs_files .cs_changed {
 	background: url("../images/icons/page_white_edit.png") no-repeat scroll
 px;
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 .cs_files .cs_removed {
 	background: url("../images/icons/page_white_delete.png") no-repeat
 		scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 #graph {
 	overflow: hidden;
+}
 #graph_nodes {
 	float: left;
 	margin-right: -6px;
-	margin-top: -4px;
+	margin-top: 0px;
+}
 #graph_content {
 	width: 800px;
 	float: left;
+}
 #graph_content .container_header {
 	border: 1px solid #CCC;
 	padding: 10px;
+}
 #graph_content #rev_range_container {
 	padding: 10px 0px;
+}
 #graph_content .container {
 	border-bottom: 1px solid #CCC;
 	border-left: 1px solid #CCC;
 	border-right: 1px solid #CCC;
 	min-height: 70px;
 	overflow: hidden;
 	font-size: 1.2em;
+}
 #graph_content .container .right {
 	float: right;
 	width: 28%;
 	text-align: right;
 	padding-bottom: 5px;
+}
 #graph_content .container .left .date {
 	font-weight: 700;
 	padding-bottom: 5px;
+}
 #graph_content .container .left .date span {
 	vertical-align: text-top;
+}
 #graph_content .container .left .author {
 	height: 22px;
+}
 #graph_content .container .left .author .user {
 	color: #444444;
 	float: left;
 	font-size: 12px;
 	margin-left: -4px;
 	margin-top: 4px;
+}
 #graph_content .container .left .message {
 	font-size: 100%;
 	padding-top: 3px;
 	white-space: pre-wrap;
+}
 #graph_content .container .left .message a:hover{
 	text-decoration: none;
+}
 .right div {
 	clear: both;
+}
 .right .changes .changed_total {
 	border: 1px solid #DDD;
 	display: block;
 	float: right;
 	text-align: center;
 	min-width: 45px;
 	cursor: pointer;
 	background: #FD8;
 	font-weight: bold;
+}
 .right .changes .added,.changed,.removed {
 	border: 1px solid #DDD;
 	display: block;
 	float: right;
 	text-align: center;
 	min-width: 15px;
 	cursor: help;
+}
 .right .changes .large {
 	border: 1px solid #DDD;
 	display: block;
 	float: right;
 	text-align: center;
 	min-width: 45px;
 	cursor: help;
 	background: #54A9F7;
+}
 .right .changes .added {
 	background: #BFB;
+}
 .right .changes .changed {
 	background: #FD8;
+}
 .right .changes .removed {
 	background: #F88;
+}
 .right .merge {
 	vertical-align: top;
 	font-size: 0.75em;
 	font-weight: 700;
+}
 .right .parent {
 	font-size: 90%;
 	font-family: monospace;
+}
 .right .logtags .branchtag {
 	background: #FFF url("../images/icons/arrow_branch.png") no-repeat right
 px;
 	display: block;
 	font-size: 0.8em;
 	padding: 11px 16px 0 0;
+}
 .right .logtags .tagtag {
 	background: #FFF url("../images/icons/tag_blue.png") no-repeat right 6px;
 	display: block;
 	font-size: 0.8em;
 	padding: 11px 16px 0 0;
+}
 div.browserblock {
 	overflow: hidden;
 	border: 1px solid #ccc;
 	background: #f8f8f8;
 	font-size: 100%;
 	line-height: 125%;
 	padding: 0;
+}
 div.browserblock .browser-header {
 	background: #FFF;
 	padding: 10px 0px 15px 0px;
 	width: 100%;
+}
 div.browserblock .browser-nav {
 	float: left
+}
 div.browserblock .browser-branch {
 	float: left;
+}
 div.browserblock .browser-branch label {
 	color: #4A4A4A;
 	vertical-align: text-top;
+}
 div.browserblock .browser-header span {
 	margin-left: 5px;
 	font-weight: 700;
+}
 div.browserblock .browser-search {
 	clear: both;
 	padding: 8px 8px 0px 5px;
 	height: 20px;
+}
 div.browserblock #node_filter_box {
+}
 div.browserblock .search_activate {
 	float: left
+}
 div.browserblock .add_node {
 	float: left;
 	padding-left: 5px;
+}
 div.browserblock .search_activate a:hover,div.browserblock .add_node a:hover
+	{
 	text-decoration: none !important;
+}

rhodecode/public/js/graph.js

➞

Show inline comments

 // branch_renderer.js - Rendering of branch DAGs on the client side
 //
 // Copyright 2010 Marcin Kuzminski <marcin AT python-works DOT com>
 // Copyright 2008 Jesper Noehr <jesper AT noehr DOT org>
 // Copyright 2008 Dirkjan Ochtman <dirkjan AT ochtman DOT nl>
 // Copyright 2006 Alexander Schremmer <alex AT alexanderweb DOT de>
 //
 // derived from code written by Scott James Remnant <scott@ubuntu.com>
 // Copyright 2005 Canonical Ltd.
 //
 // This software may be used and distributed according to the terms
 // of the GNU General Public License, incorporated herein by reference.
 var colors = [
 	[ 1.0, 0.0, 0.0 ],
 	[ 1.0, 1.0, 0.0 ],
 	[ 0.0, 1.0, 0.0 ],
 	[ 0.0, 1.0, 1.0 ],
 	[ 0.0, 0.0, 1.0 ],
 	[ 1.0, 0.0, 1.0 ],
 	[ 1.0, 1.0, 0.0 ],
 	[ 0.0, 0.0, 0.0 ]
 ];
 function BranchRenderer() {
 	this.canvas = document.getElementById("graph_canvas");
 	if (navigator.userAgent.indexOf('MSIE') >= 0)
 		this.canvas = window.G_vmlCanvasManager.initElement(this.canvas);
 	this.ctx = this.canvas.getContext('2d');
 	this.ctx.strokeStyle = 'rgb(0, 0, 0)';
 	this.ctx.fillStyle = 'rgb(0, 0, 0)';
 	this.cur = [0, 0];
 	this.max_column = 1;
 	this.line_width = 2.5;
 	this.dot_radius = 5.5;
 	this.bg = [0, 4];
 	this.cell = [2, 0];
 	this.revlink = '';
 	this.scale = function(height) {
 		this.box_size = Math.floor(height/1.2);
 		this.cell_height = this.box_size;
 		this.bg_height = height;
+	}
 	this.setColor = function(color, bg, fg) {
 		color %= colors.length;
 		var red = (colors[color][0] * fg) || bg;
 		var green = (colors[color][1] * fg) || bg;
 		var blue = (colors[color][2] * fg) || bg;
 		red = Math.round(red * 255);
 		green = Math.round(green * 255);
 		blue = Math.round(blue * 255);
 		var s = 'rgb(' + red + ', ' + green + ', ' + blue + ')';
 		this.ctx.strokeStyle = s;
 		this.ctx.fillStyle = s;
+	}
 	this.render = function(data,pad) {
 		var idx = 1;
 		var rela = document.getElementById('graph');
 		var pad = pad;
 		var scale = 22;
 		for (var i in data) {
 			this.scale(scale);
 			var row = document.getElementById("chg_"+idx);
 			var	next = document.getElementById("chg_"+idx+1);
 			var extra = 0;
 			//skip this since i don't have DATE in my app
 			//if (next.is('.changesets-date')) {
 			//	extra = next.outerHeight();
 			//}
 			this.cell[1] += row.clientWidth;
 			this.bg[1] += this.bg_height;
 			cur = data[i];
 			nodeid = cur[0];
 			node = cur[1];
 			in_l = cur[2];
 			for (var j in in_l) {
 				line = in_l[j];
 				start = line[0];
 				end = line[1];
 				color = line[2];
 				if (start > this.max_column) {
 					this.max_column = start;
+				}
 				if (end > this.max_column) {
 					this.max_column = end;
+				}
 				this.setColor(color, 0.0, 0.65);
-				y = row.offsetTop-rela.offsetTop+4;
 				y = row.offsetTop-rela.offsetTop;
 				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);
 				y += row.offsetHeight;
 				x = pad-((1 + this.box_size * end) + this.bg_height-2);
 				this.ctx.lineTo(x,y+extra,3);
 				this.ctx.stroke();
+			}
 			column = node[0]
 			color = node[1]
 			radius = this.dot_radius;
-			y = row.offsetTop-rela.offsetTop+4;
 			y = row.offsetTop-rela.offsetTop;
 			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.fill();
 			idx++;
+		}
+	}
+}

0 comments (0 inline, 0 general)