Changeset - a02b5abe091a
Parent rev.
Child rev.
[Not reviewed]
codereview
0 1 0
Marcin Kuzminski - 14 years ago 2012-05-01 22:32:53
marcin@python-works.com
Grafted from: f219eb1f6bb3
fixed small issue with changeset changed files details when clicking to load details via ajax removed info about comments
1 file changed with 2 insertions and 2 deletions:
rhodecode/templates/changelog/changelog.html
2
2
0 comments (0 inline, 0 general)
rhodecode/templates/changelog/changelog.html
➞
Show inline comments
 
@@ -18,97 +18,97 @@ ${c.repo_name} ${_('Changelog')} - ${c.r
 
	${self.menu('changelog')}
 
</%def>
 

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
		% if c.pagination:

			




	
	
	
		
 
			<div id="graph">

			




	
	
	
		
 
				<div id="graph_nodes">

			




	
	
	
		
 
					<canvas id="graph_canvas"></canvas>

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
				<div id="graph_content">

			




	
	
	
		
 
					<div class="container_header">

			




	
	
	
		
 
				        ${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 ${'tablerow%s' % (cnt%2)}">

			




	
	
	
		
 
						<div class="left">

			




	
	
	
		
 
							<div>

			




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

			




	
	
	
		
 
							<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.urlify_commit(h.wrap_paragraphs(cs.message),c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>

			




	
	
	
		
 
                            <div class="expand"><span class="expandtext">&darr; ${_('show more')} &darr;</span></div>

			




	
	
	
		
 
						</div>

			




	
	
	
		
 
						<div class="right">

			




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

			




	
	
	
		
 
									<div class="changes">

			




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

			




	
	
	
		
 
                                        <div class="comments-container">

			




	
	
	
		
 
                                        %if len(c.comments.get(cs.raw_id,[])) > 0:

			




	
	
	
		
 
                                            <div class="comments-cnt" title="${('comments')}">

			




	
	
	
		
 
                                              <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">

			




	
	
	
		
 
                                               <div class="comments-cnt">${len(c.comments[cs.raw_id])}</div>

			




	
	
	
		
 
                                               <img src="${h.url('/images/icons/comments.png')}">

			




	
	
	
		
 
                                              </a>

			




	
	
	
		
 
                                            </div>

			




	
	
	
		
 
                                        %endif

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
                                        <div class="changeset-status-container">

			




	
	
	
		
 
                                            %if c.statuses.get(cs.raw_id):

			




	
	
	
		
 
                                              <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />

			




	
	
	
		
 
                                              <div class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div>

			




	
	
	
		
 
                                            %endif

			




	
	
	
		
 
                                        </div>

			




	
	
	
		
 
									</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

			




	
	
	
		
 
								   %else:

			




	
	
	
		
 
                                        <div class="parent">${_('No parents')}</div>

			




	
	
	
		
 
                                   %endif

			




	
	
	
		
 

			




	
	
	
		
 
								<span class="logtags">

			




	
	
	
		
 
									%if len(cs.parents)>1:

			




	
	
	
		
 
									<span class="merge">${_('merge')}</span>

			




	
	
	
		
 
									%endif

			




	
	
	
		
 
									%if cs.branch:

			




	
	
	
		
 
									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">

			




	
	
	
		
 
									   ${h.link_to(h.shorter(cs.branch),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>

			




	
	
	
		
 
									%endif

			




	
	
	
		
 
									%for tag in cs.tags:

			




	
	
	
		
 
										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">

			




	
	
	
		
 
										${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>

			




	
	
	
		
 
									%endfor

			




	
	
	
		
 
								</span>

			




	
	
	
		
 
						</div>

			




	
	
	
		
 
					</div>

			




	
	
	
		
 

			




	
	
	
		
 
				%endfor

			




	
	
	
		
 
				<div class="pagination-wh pagination-left">

			




	
	
	
		
 
					${c.pagination.pager('$link_previous ~2~ $link_next')}

			




	
	
		
 
@@ -138,97 +138,97 @@ ${c.repo_name} ${_('Changelog')} - ${c.r

			




	
	
	
		
 
                            var url = url_tmpl.replace('__REVRANGE__',

			




	
	
	
		
 
                            		rev_start+'...'+rev_end);

			




	
	
	
		
 

			




	
	
	
		
 
                        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 first element height

			




	
	
	
		
 
                    var el = YUQ('#graph_content .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){

			




	
	
	
		
 
                    		var offset = row_h - (h+12);

			




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

			




	
	
	
		
 
                    		YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');

			




	
	
	
		
 
                    	};

			




	
	
	
		
 
                    }

			




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

			




	
	
	
		
 
                    	var elem = e.currentTarget.parentNode.parentNode;

			




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

			




	
	
	
		
 
                    	YUD.setStyle(elem,'height','auto');

			




	
	
	
		
 

			




	
	
	
		
 
                    	//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()});

			




	
	
	
		
 
                    	ypjax(url,id,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;

			




	
	
	
		
 
                    	var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}";

			




	
	
	
		
 
                    	var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}";

			




	
	
	
		
 
                    	var url = url.replace('__BRANCH__',selected_branch);

			




	
	
	
		
 
                    	if(selected_branch != ''){

			




	
	
	
		
 
                    		window.location = url;

			




	
	
	
		
 
                    	}else{

			




	
	
	
		
 
                    		window.location = url_main;

			




	
	
	
		
 
                    	}

			




	
	
	
		
 

			




	
	
	
		
 
                    });

			




	
	
	
		
 

			




	
	
	
		
 
					function set_canvas(heads) {

			




	
	
	
		
 
						var c = document.getElementById('graph_nodes');

			




	
	
	
		
 
						var t = document.getElementById('graph_content');

			




	
	
	
		
 
						canvas = document.getElementById('graph_canvas');

			




	
	
	
		
 
						var div_h = t.clientHeight;

			




	
	
	
		
 
						c.style.height=div_h+'px';

			




	
	
	
		
 
						canvas.setAttribute('height',div_h);

			




	
	
	
		
 
						c.style.height=max_w+'px';

			




	
	
	
		
 
						canvas.setAttribute('width',max_w);

			




	
	
	
		
 
					};

			




	
	
	
		
 
					var heads = 1;

			




	
	
	
		
 
					var max_heads = 0;

			




	
	
	
		
 
					var jsdata = ${c.jsdata|n};

			




	
	
	
		
 

			




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

			




	
	
	
		
 
					    var m = Math.max.apply(Math, jsdata[i][1]);

			




	
	
	
		
 
					    if (m>max_heads){

			




	
	
	
		
 
					        max_heads = m;

			




	
	
	
		
 
					    }

			




	
	
	
		
 
					}

			




	
	
	
		
 
					var max_w = Math.max(100,max_heads*25);

			




	
	
	
		
 
					set_canvas(max_w);

			




	
	
	
		
 

			




	
	
	
		
 
					var r = new BranchRenderer();

			




	
	
	
		
 
					r.render(jsdata,max_w);

			




	
	
	
		
 

			




	
	
	
		
 
				});

			




	
	
	
		
 
			</script>

			




	
	
	
		
 
		%else:

			




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

			




	
	
	
		
 
		%endif

			




	
	
	
		
 
    </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.