Changeset - 350d95dece6f
Parent rev.
Child rev.
[Not reviewed]
beta
0 2 0
Marcin Kuzminski - 14 years ago 2012-01-12 04:23:52
marcin@python-works.com
ui touch ups
2 files changed with 8 insertions and 4 deletions:
rhodecode/public/css/style.css
2
2
rhodecode/templates/changelog/changelog.html
6
2
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -2186,248 +2186,248 @@ h3.files_location {
 
	width: 20%;
 
	text-align: right;
 
}
 
 
#changeset_content .container .left .message {
 
	white-space: pre-wrap;
 
}
 
#changeset_content .container .left .message a:hover {
 
	text-decoration: none;
 
}
 
.cs_files .cur_cs {
 
	margin: 10px 2px;
 
	font-weight: bold;
 
}
 
 
.cs_files .node {
 
	float: left;
 
}
 
 
.cs_files .changes {
 
	float: right;
 
	color:#003367;
 
 
}
 
 
.cs_files .changes .added {
 
	background-color: #BBFFBB;
 
	float: left;
 
	text-align: center;
 
	font-size: 9px;
 
    padding: 2px 0px 2px 0px;
 
}
 
 
.cs_files .changes .deleted {
 
	background-color: #FF8888;
 
	float: left;
 
	text-align: center;
 
	font-size: 9px;
 
    padding: 2px 0px 2px 0px;
 
}
 
 
.cs_files .cs_added {
 
	background: url("../images/icons/page_white_add.png") no-repeat scroll
 
		3px;
 
	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
 
		3px;
 
	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: 0px;
 
}
 
 
#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: 7px 20px;
 
	float: left;
 
}
 
 
#graph_content .container {
 
	border-bottom: 1px solid #DDD;
 
	height: 57px;
 
	height: 56px;
 
	overflow: hidden;
 
}
 
 
#graph_content .container .right {
 
	float: right;
 
	width: 23%;
 
	text-align: right;
 
}
 
 
#graph_content .container .left {
 
	float: left;
 
	width: 25%;
 
	padding-left: 5px;
 
}
 
 
#graph_content .container .mid {
 
	float: left;
 
	width: 49%;
 
}
 
 
 
#graph_content .container .left .date {
 
	color: #666;
 
	padding-left: 22px;
 
	font-size: 10px;
 
}
 
 
#graph_content .container .left .author {
 
	height: 22px;
 
}
 
 
#graph_content .container .left .author .user {
 
	color: #444444;
 
	float: left;
 
	margin-left: -4px;
 
	margin-top: 4px;
 
}
 
 
#graph_content .container .mid .message {
 
	white-space: pre-wrap;
 
}
 
 
#graph_content .container .mid .message a:hover{
 
	text-decoration: none;
 
}
 
 
#content #graph_content .message .issue-tracker-link {
 
	font-weight: bold !important;
 
}
 
 
.right .comments-container{
 
	padding-right: 5px;
 
	margin-top:1px;
 
	float:right;
 
	height:16px;
 
	height:14px;
 
}
 
 
.right .comments-cnt{
 
    float: left;
 
    color: rgb(136, 136, 136);
 
    padding-right: 2px;
 
}
 
 
.right .changes{
 
	clear: both;
 
}
 
 
.right .changes .changed_total {
 
	display: block;
 
	float: right;
 
	text-align: center;
 
	min-width: 45px;
 
	cursor: pointer;
 
	color: #444444;
 
	background: #FEA;
 
	-webkit-border-radius: 0px 0px 0px 6px;
 
	-moz-border-radius: 0px 0px 0px 6px;
 
	border-radius: 0px 0px 0px 6px;
 
	padding: 1px;
 
}
 
 
.right .changes .added,.changed,.removed {
 
	display: block;
 
	padding: 1px;
 
	color: #444444;
 
	float: right;
 
	text-align: center;
 
	min-width: 15px;
 
}
 
 
.right .changes .added {
 
	background: #CFC;
 
}
 
 
.right .changes .changed {
 
	background: #FEA;
 
}
 
 
.right .changes .removed {
 
	background: #FAA;
 
}
 
 
.right .merge {
 
  padding: 1px 3px 1px 3px;
 
  background-color: #fca062;
 
  font-size: 10px;
 
  font-weight: bold;
 
  color: #ffffff;
 
  text-transform: uppercase;
 
  white-space: nowrap;
 
  -webkit-border-radius: 3px;
 
  -moz-border-radius: 3px;
 
  border-radius: 3px;
 
  margin-right: 2px;
 
}
 
 
.right .parent {
 
	color: #666666;
 
	clear:both;
 
}
 
.right .logtags{
 
	padding: 2px 2px 2px 2px;
 
}
 
.right .logtags .branchtag,.logtags .branchtag {
 
  padding: 1px 3px 1px 3px;
 
  background-color: #bfbfbf;
 
  font-size: 10px;
 
  font-weight: bold;
 
  color: #ffffff;
 
  text-transform: uppercase;
 
  white-space: nowrap;
 
  -webkit-border-radius: 3px;
 
  -moz-border-radius: 3px;
 
  border-radius: 3px;
 
}
 
.right .logtags .branchtag a:hover,.logtags .branchtag a{
 
	color: #ffffff;
 
}
 
.right .logtags .branchtag a:hover,.logtags .branchtag a:hover{
 
	text-decoration: none;
 
	color: #ffffff;
 
}
 
.right .logtags .tagtag,.logtags .tagtag {
 
  padding: 1px 3px 1px 3px;
 
  background-color: #62cffc;
 
  font-size: 10px;
 
  font-weight: bold;
 
  color: #ffffff;
 
  text-transform: uppercase;
 
  white-space: nowrap;
 
  -webkit-border-radius: 3px;
rhodecode/templates/changelog/changelog.html
➞
Show inline comments
 
## -*- coding: utf-8 -*-
 

			




	
	
	
		
 
<%inherit file="/base/base.html"/>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="breadcrumbs_links()">

			




	
	
	
		
 
    ${h.link_to(u'Home',h.url('/'))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}

			




	
	
	
		
 
    &raquo;

			




	
	
	
		
 
    ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')}  

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
	${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 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')}">${len(c.comments.get(cs.raw_id,[]))}</div>

			




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

			




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

			




	
	
	
		
 
								   %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(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(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')}

			




	
	
	
		
 
				</div>			

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
			

			




	
	
	
		
 
			<script type="text/javascript" src="${h.url('/js/graph.js')}"></script>

			




	
	
	
		
 
			<script type="text/javascript">

			




	
	
	
		
 
				YAHOO.util.Event.onDOMReady(function(){

			




	
	
	
		
 
					

			




	
	
	
		
 
                    //Monitor range checkboxes and build a link to changesets

			




	
	
	
		
 
                    //ranges 

			




	
	
	
		
 
                    var checkboxes = YUD.getElementsByClassName('changeset_range');

			




	
	
	
		
 
                    var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";

			




	
	
	
		
 
                    YUE.on(checkboxes,'click',function(e){      

			




	
	
	
		
 
                        var checked_checkboxes = [];

			




	
	
	
		
 
                        for (pos in checkboxes){

			




	
	
	
		
 
                            if(checkboxes[pos].checked){

			




	
	
	
		
 
                                checked_checkboxes.push(checkboxes[pos]);

			




	
	
	
		
 
                            }

			




	
	
	
		
 
                        }

			




	
	
	
		
 
                        if(checked_checkboxes.length>1){

			




	
	
	
		
 
                        	var rev_end = checked_checkboxes[0].name;

			




	
	
	
		
 
                        	var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;

			




	
	
	
		
 
                        	

			




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

			




	
	
	
		
 
                    	};

			




	
	
	
		
 
                    }

			




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

			




	
	
	
		
 
                    	

			




        

    



    


    



    



      

      





    
    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.