Changeset - 37b3c3244bbc
Parent rev.
Child rev.
[Not reviewed]
beta
0 7 0
Marcin Kuzminski - 14 years ago 2012-01-09 02:46:56
marcin@python-works.com
UI fixes
- added expandable commits messages
- ui fixes, icons/graph
7 files changed with 95 insertions and 36 deletions:
development.ini
3
3
rhodecode/lib/helpers.py
2
2
rhodecode/public/css/style.css
34
5
rhodecode/public/js/graph.js
11
11
rhodecode/templates/changelog/changelog.html
34
4
rhodecode/templates/changeset/changeset.html
6
6
rhodecode/templates/changeset/diff_block.html
5
5
0 comments (0 inline, 0 general)
development.ini
➞
Show inline comments
 
@@ -65,35 +65,35 @@ proxypass_auth_enabled = false
 
## netloc - network location
 
## path - usually repo_name
 

			




	
	
	
		
 
#clone_uri = {scheme}://{user}{pass}{netloc}{path}

			




	
	
	
		
 

			




	
	
	
		
 
## issue tracking mapping for commits messages

			




	
	
	
		
 
## uncomment url_pat, issue_server, issue_prefix to enable

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
## pattern to get the issues from commit messages

			




	
	
	
		
 
## default one used here is #1234

			




	
	
	
		
 

			




	
	
	
		
 
#url_pat = (?:^#|\s#)(\w+)

			




	
	
	
		
 
url_pat = (?:^#|\s#)(\w+)

			




	
	
	
		
 

			




	
	
	
		
 
## server url to the issue, each {id} will be replaced with id

			




	
	
	
		
 
## fetched from the regex

			




	
	
	
		
 

			




	
	
	
		
 
#issue_server = https://myissueserver.com/issue/{id}

			




	
	
	
		
 
issue_server = https://myissueserver.com/issue/{id}

			




	
	
	
		
 

			




	
	
	
		
 
## prefix to add to link to indicate it's an url

			




	
	
	
		
 
## #314 will be replaced by <issue_prefix><id>

			




	
	
	
		
 

			




	
	
	
		
 
#issue_prefix = #

			




	
	
	
		
 
issue_prefix = #

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
####################################

			




	
	
	
		
 
###        CELERY CONFIG        ####

			




	
	
	
		
 
####################################

			




	
	
	
		
 
use_celery = false

			




	
	
	
		
 
broker.host = localhost

			




	
	
	
		
 
broker.vhost = rabbitmqhost

			




	
	
	
		
 
broker.port = 5672

			




	
	
	
		
 
broker.user = rabbitmq

			




	
	
	
		
 
broker.password = qweqwe

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/lib/helpers.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -749,26 +749,26 @@ def urlify_commit(text_):

			




	
	
	
		
 
    

			




	
	
	
		
 
    try:

			




	
	
	
		
 
        conf = config['app_conf']

			




	
	
	
		
 
        

			




	
	
	
		
 
        URL_PAT = re.compile(r'%s' % conf.get('url_pat'))

			




	
	
	
		
 
        

			




	
	
	
		
 
        if URL_PAT:

			




	
	
	
		
 
            ISSUE_SERVER = conf.get('issue_server')

			




	
	
	
		
 
            ISSUE_PREFIX = conf.get('issue_prefix')

			




	
	
	
		
 
            def url_func(match_obj):

			




	
	
	
		
 
                issue_id = match_obj.groups()[0]

			




	
	
	
		
 
                tmpl = (

			




	
	
	
		
 
                '<a class="%(cls)s" href="%(url)s">'

			




	
	
	
		
 
                ' %(issue-prefix)s%(id-repr)s'

			




	
	
	
		
 
                ' <a class="%(cls)s" href="%(url)s">'

			




	
	
	
		
 
                '%(issue-prefix)s%(id-repr)s'

			




	
	
	
		
 
                '</a>'

			




	
	
	
		
 
                )

			




	
	
	
		
 
                return tmpl % (

			




	
	
	
		
 
                    {

			




	
	
	
		
 
                     'cls':'issue-tracker-link',

			




	
	
	
		
 
                     'url':ISSUE_SERVER.replace('{id}',issue_id),

			




	
	
	
		
 
                     'id-repr':issue_id,

			




	
	
	
		
 
                     'issue-prefix':ISSUE_PREFIX,

			




	
	
	
		
 
                     'serv':ISSUE_SERVER,

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                )

			




	
	
	
		
 
            return literal(URL_PAT.sub(url_func, text_))

			




        

    


    
    

    

        

                

                    rhodecode/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -1121,25 +1121,45 @@ tbody .yui-dt-editable { cursor: pointer

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.messages {

			




	
	
	
		
 
	clear: both;

			




	
	
	
		
 
	overflow: hidden;

			




	
	
	
		
 
	margin: 0 20px;

			




	
	
	
		
 
	padding: 0;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.message {

			




	
	
	
		
 
	clear: both;

			




	
	
	
		
 
	overflow: hidden;

			




	
	
	
		
 
	margin: 0;

			




	
	
	
		
 
	padding: 10px 0;

			




	
	
	
		
 
	padding: 5px 0;

			




	
	
	
		
 
    white-space: pre-wrap;

			




	
	
	
		
 
}

			




	
	
	
		
 
#content div.box div.expand{

			




	
	
	
		
 
position:absolute;

			




	
	
	
		
 
width:inherit;

			




	
	
	
		
 
height:14px;

			




	
	
	
		
 
font-size:14px;

			




	
	
	
		
 
text-align:left;

			




	
	
	
		
 
cursor: pointer;

			




	
	
	
		
 
font-family: monospace;

			




	
	
	
		
 
color:#003367;

			




	
	
	
		
 
/*

			




	
	
	
		
 
background:-webkit-gradient(linear,0% 50%,100% 50%,color-stop(0%,rgba(255,255,255,0)),color-stop(100%,rgba(255,255,255,1)));

			




	
	
	
		
 
background:-webkit-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));

			




	
	
	
		
 
background:-moz-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));

			




	
	
	
		
 
background:-o-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));

			




	
	
	
		
 
background:-ms-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));

			




	
	
	
		
 
background:linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));

			




	
	
	
		
 
*/

			




	
	
	
		
 
display: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.message a {

			




	
	
	
		
 
	font-weight: 400 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#content div.box div.message div.image {

			




	
	
	
		
 
	float: left;

			




	
	
	
		
 
	margin: 9px 0 0 5px;

			




	
	
	
		
 
	padding: 6px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
		
 
@@ -2106,26 +2126,30 @@ h3.files_location {

			




	
	
	
		
 
#files_data dl dt {

			




	
	
	
		
 
	float: left;

			




	
	
	
		
 
	width: 60px;

			




	
	
	
		
 
	margin: 0 !important;

			




	
	
	
		
 
	padding: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#files_data dl dd {

			




	
	
	
		
 
	margin: 0 !important;

			




	
	
	
		
 
	padding: 5px !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.tablerow0 {

			




	
	
	
		
 
	background-color: #F8F8F8;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.tablerow1 {

			




	
	
	
		
 
	background-color: #F8F8F8;

			




	
	
	
		
 
    background-color: #FFFFFF;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.changeset_id {

			




	
	
	
		
 
	font-family: monospace;

			




	
	
	
		
 
	color: #666666;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.changeset_hash {

			




	
	
	
		
 
	color: #000000;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#changeset_content {

			




	
	
		
 
@@ -2237,25 +2261,25 @@ h3.files_location {

			




	
	
	
		
 
#graph_content {

			




	
	
	
		
 
	width: 80%;

			




	
	
	
		
 
	float: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container_header {

			




	
	
	
		
 
	border-bottom: 1px solid #DDD;

			




	
	
	
		
 
	padding: 10px;

			




	
	
	
		
 
	height: 25px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content #rev_range_container {

			




	
	
	
		
 
	padding: 5px 20px;

			




	
	
	
		
 
	padding: 7px 20px;

			




	
	
	
		
 
	float: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container {

			




	
	
	
		
 
	border-bottom: 1px solid #DDD;

			




	
	
	
		
 
	height: 55px;

			




	
	
	
		
 
	overflow: hidden;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .right {

			




	
	
	
		
 
	float: right;

			




	
	
	
		
 
	width: 23%;

			




	
	
		
 
@@ -2267,24 +2291,25 @@ h3.files_location {

			




	
	
	
		
 
	width: 25%;

			




	
	
	
		
 
	padding-left: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .mid {

			




	
	
	
		
 
	float: left;

			




	
	
	
		
 
	width: 49%;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .left .date {

			




	
	
	
		
 
	color: #444444;

			




	
	
	
		
 
	padding-left: 22px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .left .author {

			




	
	
	
		
 
	height: 22px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .left .author .user {

			




	
	
	
		
 
	color: #444444;

			




	
	
	
		
 
	float: left;

			




	
	
	
		
 
	margin-left: -4px;

			




	
	
	
		
 
	margin-top: 4px;

			




	
	
	
		
 
}

			




	
	
		
 
@@ -2530,25 +2555,28 @@ table.code-browser .browser-file {

			




	
	
	
		
 
.diffblock .diff-menu{

			




	
	
	
		
 
    position: absolute;

			




	
	
	
		
 
    background: none repeat scroll 0 0 #FFFFFF;

			




	
	
	
		
 
    border-color: #003367 #666666 #666666;

			




	
	
	
		
 
    border-right: 1px solid #666666;

			




	
	
	
		
 
    border-style: solid solid solid;

			




	
	
	
		
 
    border-width: 1px;

			




	
	
	
		
 
    box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);

			




	
	
	
		
 
    margin-top:5px;

			




	
	
	
		
 
    margin-left:1px;

			




	
	
	
		
 
    

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.diffblock .diff-actions {

			




	
	
	
		
 
    padding: 2px 0px 0px 2px;

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
}

			




	
	
	
		
 
.diffblock  .diff-menu ul li {

			




	
	
	
		
 
	padding: 0px 0px 0px 0px !important;

			




	
	
	
		
 
}

			




	
	
	
		
 
.diffblock  .diff-menu ul li a{

			




	
	
	
		
 
	display: block;

			




	
	
	
		
 
	padding: 3px 8px 3px 8px !important;

			




	
	
	
		
 
}

			




	
	
	
		
 
.diffblock  .diff-menu ul li a:hover{

			




	
	
	
		
 
    text-decoration: none;

			




	
	
	
		
 
    background-color: #EEEEEE;

			




	
	
	
		
 
}

			




	
	
	
		
 
table.code-browser .browser-dir {

			




	
	
		
 
@@ -3978,24 +4006,25 @@ div.diffblock .code-header{

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock .code-header.cv{

			




	
	
	
		
 
    height: 34px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock .code-header-title{

			




	
	
	
		
 
	padding: 0px 0px 10px 5px !important;

			




	
	
	
		
 
	margin: 0 !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.diffblock .code-header .date{

			




	
	
	
		
 
    float:left;

			




	
	
	
		
 
    text-transform: uppercase;

			




	
	
	
		
 
    padding: 2px 0px 0px 2px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock .code-header div{

			




	
	
	
		
 
    margin-left:4px;

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    font-size: 14px;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock .code-body{

			




	
	
	
		
 
    background: #FFFFFF;

			




	
	
	
		
 
}

			




	
	
	
		
 
div.diffblock pre.raw{

			




	
	
	
		
 
    background: #FFFFFF;

			




	
	
	
		
 
    color:#000000;

			




	
	
		
 
@@ -4090,13 +4119,13 @@ table.code-difftable .code pre{

			




	
	
	
		
 
    background-color:#FFFFCC !important;

			




	
	
	
		
 
    cursor: pointer !important;

			




	
	
	
		
 
    background-image:url("../images/icons/comment_add.png") !important;

			




	
	
	
		
 
    background-repeat:no-repeat !important;

			




	
	
	
		
 
    background-position: right !important;

			




	
	
	
		
 
    background-position: 0% 50% !important;

			




	
	
	
		
 
}

			




	
	
	
		
 
.diffblock.margined.comm .line .code.no-comment:hover{

			




	
	
	
		
 
	background-image: none !important;

			




	
	
	
		
 
	cursor: auto !important;

			




	
	
	
		
 
	background-color: inherit !important;

			




	
	
	
		
 
	

			




	
	
	
		
 
}

			




	
	
		
 
\ No newline at end of file

			




	
	
	
		
 
}

			




        

    


    
    

    

        

                

                    rhodecode/public/js/graph.js
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -54,90 +54,90 @@ function BranchRenderer() {

			




	
	
	
		
 
		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);

			




	
	
	
		
 
			if(row == null){

			




	
	
	
		
 
				continue

			




	
	
	
		
 
			}

			




	
	
	
		
 
			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];

			




	
	
	
		
 
			

			




	
	
	
		
 

			




	
	
	
		
 
			var pos_ = 26;

			




	
	
	
		
 

			




	
	
	
		
 
			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+row.offsetHeight/2;

			




	
	
	
		
 
				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);

			




	
	
	
		
 

			




	
	
	
		
 
				

			




	
	
	
		
 
				if (start == end)

			




	
	
	
		
 
				{

			




	
	
	
		
 
					x = pad-((1 + this.box_size * end) + this.bg_height-2);

			




	
	
	
		
 
					y += row.offsetHeight;

			




	
	
	
		
 
					this.ctx.lineTo(x,y+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);

			




	
	
	
		
 
					this.ctx.bezierCurveTo(x,ymid,x2,ymid,x2,y2);

			




	
	
	
		
 
				}

			




	
	
	
		
 
				this.ctx.stroke();

			




	
	
	
		
 
			}

			




	
	
	
		
 
			

			




	
	
	
		
 
			column = node[0]

			




	
	
	
		
 
			color = node[1]

			




	
	
	
		
 
			

			




	
	
	
		
 
			radius = this.dot_radius;

			




	
	
	
		
 
			y = row.offsetTop-rela.offsetTop+row.offsetHeight/2;

			




	
	
	
		
 
			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.fill();

			




	
	
	
		
 
			

			




	
	
	
		
 
			idx++;

			




	
	
	
		
 
		}

			




	
	
	
		
 
				

			




	
	
	
		
 
	}

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    rhodecode/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -35,39 +35,41 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

			




	
	
	
		
 
				        ${h.form(h.url.current(),method='get')}

			




	
	
	
		
 
				        <div class="info_box" style="float:left">

			




	
	
	
		
 
				          ${h.submit('set',_('Show'),class_="ui-btn")}

			




	
	
	
		
 
				          ${h.text('size',size=1,value=c.size)}

			




	
	
	
		
 
				          ${_('revisions')}

			




	
	
	
		
 
				        </div>

			




	
	
	
		
 
				        ${h.end_form()}

			




	
	
	
		
 
					<div id="rev_range_container" style="display:none"></div>

			




	
	
	
		
 
                    <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>

			




	
	
	
		
 
					</div>

			




	
	
	
		
 
					

			




	
	
	
		
 
				%for cnt,cs in enumerate(c.pagination):

			




	
	
	
		
 
					<div id="chg_${cnt+1}" class="container ${'tablerow1' if cnt%2==0 else 'tablerow2'}">

			




	
	
	
		
 
					<div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">

			




	
	
	
		
 
						<div class="left">

			




	
	
	
		
 
							<div>

			




	
	
	
		
 
							${h.checkbox(cs.short_id,class_="changeset_range")}

			




	
	
	
		
 
							<span class="tooltip" title="${cs.date}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>

			




	
	
	
		
 
							<span class="tooltip" title="${h.age(cs.date)}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>

			




	
	
	
		
 
							</div>

			




	
	
	
		
 
							<div class="author">

			




	
	
	
		
 
								<div class="gravatar">

			




	
	
	
		
 
									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),16)}"/>

			




	
	
	
		
 
								</div>

			




	
	
	
		
 
								<div title="${cs.author}" class="user">${h.person(cs.author)}</div>

			




	
	
	
		
 
							</div>

			




	
	
	
		
 
                            <div class="date">${cs.date}</div>

			




	
	
	
		
 
						</div>

			




	
	
	
		
 
						<div class="mid">

			




	
	
	
		
 
							<div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                            <div class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message))}</div>

			




	
	
	
		
 
                            <div class="expand ${'tablerow%s' % (cnt%2)}">&darr; ${_('show more')} &darr;</div>

			




	
	
	
		
 
						</div>	

			




	
	
	
		
 
						<div class="right">

			




	
	
	
		
 
									<div id="${cs.raw_id}_changes_info" class="changes">

			




	
	
	
		
 
                                        <span id="${cs.raw_id}" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</span>

			




	
	
	
		
 
									</div>					

			




	
	
	
		
 
								   %if cs.parents:

			




	
	
	
		
 
									%for p_cs in reversed(cs.parents):

			




	
	
	
		
 
										<div class="parent">${_('Parent')}

			




	
	
	
		
 
											<span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),

			




	
	
	
		
 
											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>

			




	
	
	
		
 
										</div>

			




	
	
	
		
 
									%endfor

			




	
	
		
 
@@ -123,24 +125,52 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

			




	
	
	
		
 
                        var link = "<a href="+url+">${_('Show selected changes __S -> __E')}</a>"

			




	
	
	
		
 
                        link = link.replace('__S',rev_start);

			




	
	
	
		
 
                        link = link.replace('__E',rev_end);

			




	
	
	
		
 
                        YUD.get('rev_range_container').innerHTML = link;

			




	
	
	
		
 
                        YUD.setStyle('rev_range_container','display','');

			




	
	
	
		
 
                        }

			




	
	
	
		
 
                        else{

			




	
	
	
		
 
                        	YUD.setStyle('rev_range_container','display','none');

			




	
	
	
		
 
                        	

			




	
	
	
		
 
                        }

			




	
	
	
		
 
                    });					

			




	
	
	
		
 
					

			




	
	
	
		
 
                    var msgs = YUQ('.message');

			




	
	
	
		
 
                    // get firts element height;

			




	
	
	
		
 
                    var el = YUQ('.container')[0];

			




	
	
	
		
 
                    var row_h = el.clientHeight;

			




	
	
	
		
 
                    for(var i=0;i<msgs.length;i++){

			




	
	
	
		
 
                    	var m = msgs[i];

			




	
	
	
		
 

			




	
	
	
		
 
                    	var h = m.clientHeight;

			




	
	
	
		
 
                    	var pad = YUD.getStyle(m,'padding');

			




	
	
	
		
 
                    	if(h > row_h){

			




	
	
	
		
 
                    		YUD.setStyle(m.nextElementSibling,'display','block');

			




	
	
	
		
 
                    		YUD.setStyle(m.nextElementSibling,'margin-top',row_h-(h+14)+'px');

			




	
	
	
		
 
                    		YUD.setAttribute(m.nextElementSibling,'expand',h);

			




	
	
	
		
 
                    	};

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                    YUE.on(YUQ('.expand'),'click',function(e){

			




	
	
	
		
 
                    	var elem = e.currentTarget.parentElement.parentElement;

			




	
	
	
		
 
                    	YUD.setStyle(e.currentTarget,'display','none');

			




	
	
	
		
 
                    	YUD.setStyle(elem,'height',YUD.getAttribute(e.currentTarget,'expand')+'px');

			




	
	
	
		
 
                    	

			




	
	
	
		
 
                    	//redraw the graph max_w and jsdata are global vars

			




	
	
	
		
 
                        set_canvas(max_w);

			




	
	
	
		
 
                        

			




	
	
	
		
 
                        var r = new BranchRenderer();

			




	
	
	
		
 
                        r.render(jsdata,max_w);                    	

			




	
	
	
		
 
                    	

			




	
	
	
		
 
                    })

			




	
	
	
		
 
                    

			




	
	
	
		
 
                    // Fetch changeset details 

			




	
	
	
		
 
                    YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){

			




	
	
	
		
 
                    	var id = e.currentTarget.id

			




	
	
	
		
 
                    	var url = "${h.url('changelog_details',repo_name=c.repo_name,cs='__CS__')}"

			




	
	
	
		
 
                    	var url = url.replace('__CS__',id);

			




	
	
	
		
 
                    	ypjax(url,id+'_changes_info',function(){tooltip_activate()});

			




	
	
	
		
 
                    });

			




	
	
	
		
 
                    

			




	
	
	
		
 
                    // change branch filter

			




	
	
	
		
 
                    YUE.on(YUD.get('branch_filter'),'change',function(e){

			




	
	
	
		
 
                    	var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;

			




	
	
	
		
 
                    	console.log(selected_branch);

			




	
	
		
 
@@ -179,13 +209,13 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

			




	
	
	
		
 
					set_canvas(max_w);

			




	
	
	
		
 
					

			




	
	
	
		
 
					var r = new BranchRenderer();

			




	
	
	
		
 
					r.render(jsdata,max_w);

			




	
	
	
		
 
										

			




	
	
	
		
 
				});

			




	
	
	
		
 
			</script>

			




	
	
	
		
 
		%else:

			




	
	
	
		
 
			${_('There are no changes yet')}

			




	
	
	
		
 
		%endif  

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>    

			




	
	
	
		
 
</%def>

			




	
	
		
 
\ No newline at end of file

			




	
	
	
		
 
</%def>

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -18,33 +18,33 @@

			




	
	
	
		
 
    ${self.menu('changelog')}     

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
		<div class="diffblock">

			




	
	
	
		
 
			<div class="code-header">

			




	
	
	
		
 
                <div class="date">${c.changeset.revision}:

			




	
	
	
		
 
                  ${h.link_to(h.short_id(c.changeset.raw_id),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}

			




	
	
	
		
 
                <div class="date">

			




	
	
	
		
 
                  R${c.changeset.revision}:${h.link_to(h.short_id(c.changeset.raw_id),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}

			




	
	
	
		
 
                  ${c.changeset.date}</div>

			




	
	
	
		
 
                <span class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white_text.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/down_16.png')}"/></a>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>

			




	
	
	
		
 
                  ${c.ignorews_url()}

			




	
	
	
		
 
                  ${c.context_url()}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="comments-number" style="float:right;padding-right:5px">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
		</div>

			




	
	
	
		
 
	    <div id="changeset_content">

			




	
	
	
		
 
			<div class="container">

			




	
	
	
		
 
	             <div class="left">

			




	
	
	
		
 
	                 <div class="author">

			




	
	
	
		
 
	                     <div class="gravatar">

			




	
	
	
		
 
	                         <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/>

			




	
	
	
		
 
	                     </div>

			




	
	
	
		
 
	                     <span>${h.person(c.changeset.author)}</span><br/>

			




	
	
	
		
 
	                     <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/diff_block.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,31 +6,31 @@

			




	
	
	
		
 
<%def name="diff_block(changes)">

			




	
	
	
		
 

			




	
	
	
		
 
%for change,filenode,diff,cs1,cs2,stat in changes:

			




	
	
	
		
 
    %if change !='removed':

			




	
	
	
		
 
    <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}_target" style="clear:both;height:90px;margin-top:-60px"></div>

			




	
	
	
		
 
    <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}" class="diffblock  margined comm">

			




	
	
	
		
 
        <div class="code-header">

			




	
	
	
		
 
            <div class="changeset_header">

			




	
	
	
		
 
                <div class="changeset_file">

			




	
	
	
		
 
                    ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
                    revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <span class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" title="${_('diff')}"><img class="icon" src="${h.url('/images/icons/page_white_text.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white_text.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/down_16.png')}"/></a>

			




	
	
	
		
 
                <div class="diff-actions">

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" title="${_('diff')}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>

			




	
	
	
		
 
                  <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>

			




	
	
	
		
 
                  ${c.ignorews_url(h.FID(filenode.changeset.raw_id,filenode.path))}

			




	
	
	
		
 
                  ${c.context_url(h.FID(filenode.changeset.raw_id,filenode.path))}

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <span style="float:right;margin-top:-3px">

			




	
	
	
		
 
                  <label>

			




	
	
	
		
 
                  ${_('show inline comments')}

			




	
	
	
		
 
                  ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(filenode.changeset.raw_id,filenode.path))}

			




	
	
	
		
 
                  </label>

			




	
	
	
		
 
                </span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        <div class="code-body">

			




	
	
	
		
 
            <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div>        

			




	
	
	
		
 
            ${diff|n}

			




	
	
	
		
 
        </div>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.