Changeset - 555b68f94c45
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 15 years ago 2010-12-07 03:08:15
marcin@python-works.com
some small css fixes for changesets
3 files changed with 15 insertions and 4 deletions:
rhodecode/public/css/style.css
11
rhodecode/templates/changeset/changeset.html
2
2
rhodecode/templates/files/file_diff.html
2
2
0 comments (0 inline, 0 general)
rhodecode/public/css/style.css
➞
Show inline comments
 
@@ -1469,384 +1469,395 @@ min-height:120px;
 
font-size:1.2em;
 
overflow:hidden;
 
}
 
 
#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 .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 {
 
width:160px;
 
float:left;
 
margin-left:-50px;
 
margin-top:5px;
 
}
 
 
#graph_content {
 
width:800px;
 
float:left;
 
}
 
 
#graph_content .container_header {
 
border:1px solid #CCC;
 
padding:10px;
 
}
 
 
#graph_content .container {
 
border-bottom:1px solid #CCC;
 
border-left:1px solid #CCC;
 
border-right:1px solid #CCC;
 
min-height:80px;
 
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 .message {
 
font-size:100%;
 
padding-top:3px;
 
white-space:pre-wrap;
 
}
 
 
.right div {
 
clear:both;
 
}
 
 
.right .changes .added,.changed,.removed {
 
border:1px solid #DDD;
 
display:block;
 
float:right;
 
text-align:center;
 
min-width:15px;
 
cursor: help;
 
}
 
 
.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 6px;
 
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 {
 
border-bottom:1px solid #CCC;
 
background:#FFF;
 
color:blue;
 
padding:10px 0;
 
}
 
 
div.browserblock .browser-header span {
 
margin-left:25px;
 
font-weight:700;
 
}
 
 
div.browserblock .browser-body {
 
background:#EEE;
 
}
 
 
table.code-browser {
 
border-collapse:collapse;
 
width:100%;
 
}
 
 
table.code-browser tr {
 
margin:3px;
 
}
 
 
table.code-browser thead th {
 
background-color:#EEE;
 
height:20px;
 
font-size:1.1em;
 
font-weight:700;
 
text-align:left;
 
padding-left:10px;
 
}
 
 
table.code-browser tbody td {
 
padding-left:10px;
 
height:20px;
 
}
 
 
table.code-browser .browser-file {
 
background:url("../images/icons/document_16.png") no-repeat scroll 3px;
 
height:16px;
 
padding-left:20px;
 
text-align:left;
 
}
 
.diffblock .changeset_file{
 
background:url("../images/icons/file.png") no-repeat scroll 3px;
 
height:16px;
 
padding-left:22px;
 
text-align:left;
 
font-size: 14px;
 
}
 
 
.diffblock .changeset_header{
 
margin-left: 6px !important;
 
}
 
 
table.code-browser .browser-dir {
 
background:url("../images/icons/folder_16.png") no-repeat scroll 3px;
 
height:16px;
 
padding-left:20px;
 
text-align:left;
 
}
 
 
.box .search {
 
clear:both;
 
overflow:hidden;
 
margin:0;
 
padding:0 20px 10px;
 
}
 
 
.box .search div.search_path {
 
background:none repeat scroll 0 0 #EEE;
 
border:1px solid #CCC;
 
color:blue;
 
margin-bottom:10px;
 
padding:10px 0;
 
}
 
 
.box .search div.search_path div.link {
 
font-weight:700;
 
margin-left:25px;
 
}
 
 
.box .search div.search_path div.link a {
 
color:#003367;
 
cursor:pointer;
 
text-decoration:none;
 
}
 
 
#path_unlock {
 
color:red;
 
font-size:1.2em;
 
padding-left:4px;
 
}
 
 
.info_box * {
 
background:url("../../images/pager.png") repeat-x scroll 0 0 #EBEBEB;
 
color:#4A4A4A;
 
font-weight:700;
 
height:1%;
 
display:inline;
 
border-color:#DEDEDE #C4C4C4 #C4C4C4 #CFCFCF;
 
border-style:solid;
 
border-width:1px;
 
padding:4px 6px;
 
}
 
 
.info_box span {
 
margin-left:3px;
 
margin-right:3px;
 
}
 
 
.info_box input#at_rev {
 
text-align:center;
 
padding:5px 3px 3px 2px;
 
}
 
 
.info_box input#view {
 
text-align:center;
 
padding:4px 3px 2px 2px;
 
}
 
 
.yui-overlay,.yui-panel-container {
 
visibility:hidden;
 
position:absolute;
 
z-index:2;
 
}
 
 
.yui-tt {
 
visibility:hidden;
 
position:absolute;
 
color:#666;
 
background-color:#FFF;
 
font-family:arial, helvetica, verdana, sans-serif;
 
border:2px solid #003367;
 
font:100% sans-serif;
 
width:auto;
 
opacity:1px;
 
padding:8px;
 
white-space: pre;
 
}
 
 
.ac {
 
vertical-align:top;
 
}
 
 
.ac .yui-ac {
 
position:relative;
 
font-family:arial;
 
font-size:100%;
 
}
 
 
.ac .perm_ac {
 
width:15em;
 
}
 
 
.ac .yui-ac-input {
 
width:100%;
 
}
 
 
.ac .yui-ac-container {
 
position:absolute;
 
top:1.6em;
 
width:100%;
 
}
 
 
.ac .yui-ac-content {
 
position:absolute;
 
width:100%;
 
border:1px solid gray;
 
background:#fff;
 
overflow:hidden;
 
z-index:9050;
 
}
 
 
.ac .yui-ac-shadow {
 
position:absolute;
 
width:100%;
 
background:#000;
 
-moz-opacity:0.1px;
 
opacity:.10;
 
filter:alpha(opacity =   10);
 
z-index:9049;
 
margin:.3em;
 
}
 
 
.ac .yui-ac-content ul {
 
width:100%;
 
margin:0;
 
padding:0;
 
}
 
 
.ac .yui-ac-content li {
 
cursor:default;
 
white-space:nowrap;
 
margin:0;
 
padding:2px 5px;
 
}
 
 
.ac .yui-ac-content li.yui-ac-prehighlight {
 
background:#B3D4FF;
 
}
 
 
.ac .yui-ac-content li.yui-ac-highlight {
 
background:#556CB5;
 
color:#FFF;
 
}
 
 
.follow{
 
background:url("../images/icons/heart_add.png") no-repeat scroll 3px;
 
height: 16px;
 
width: 20px;
 
cursor: pointer;
 
display: block;
 
float: right;
 
margin-top: 2px;
 
}
 
 
.following{
 
background:url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 
height: 16px;
 
width: 20px;
 
cursor: pointer;
 
display: block;
 
float: right;
 
margin-top: 2px;
 
}
 
 
.currently_following{
 
padding-left: 10px;
 
padding-bottom:5px;
 
}
 
 
.journal_highlight{
 
font-weight: bold;
 
text-decoration: underline;
 
}
 
 
.add_icon {
 
background:url("../images/icons/add.png") no-repeat scroll 3px;
 
height:16px;
 
padding-left:20px;
 
padding-top:1px;
 
text-align:left;
 
}
 
 
.edit_icon {
rhodecode/templates/changeset/changeset.html
➞
Show inline comments
 
<%inherit file="/base/base.html"/>
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${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;

			




	
	
	
		
 
    ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}

			




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

			




	
	
	
		
 
		<div id="body" class="diffblock">

			




	
	
	
		
 
			<div class="code-header">

			




	
	
	
		
 
				<div>

			




	
	
	
		
 
				${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}

			




	
	
	
		
 
				 &raquo; <span>${h.link_to(_('raw diff'),

			




	
	
	
		
 
				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show'))}</span>

			




	
	
	
		
 
				 &raquo; <span>${h.link_to(_('download diff'),

			




	
	
	
		
 
				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download'))}</span>

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
		</div>

			




	
	
	
		
 
	    <div id="changeset_content">

			




	
	
	
		
 
			<div class="container">

			




	
	
	
		
 
	             <div class="left">

			




	
	
	
		
 
	                 <div class="date">${_('commit')} ${c.changeset.revision}: ${h.short_id(c.changeset.raw_id)}@${c.changeset.date}</div>

			




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

			




	
	
	
		
 
	                 </div>

			




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

			




	
	
	
		
 
	             </div>

			




	
	
	
		
 
	             <div class="right">

			




	
	
	
		
 
		             <div class="changes">

			




	
	
	
		
 
		                 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>

			




	
	
	
		
 
		                 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>

			




	
	
	
		
 
		                 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>

			




	
	
	
		
 
		             </div>                  

			




	
	
	
		
 
		                 %if len(c.changeset.parents)>1:

			




	
	
	
		
 
		                 <div class="merge">

			




	
	
	
		
 
		                     ${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>

			




	
	
	
		
 
		                 </div>

			




	
	
	
		
 
		                 %endif

			




	
	
	
		
 
		                 

			




	
	
	
		
 
		            %if c.changeset.parents:

			




	
	
	
		
 
		             %for p_cs in reversed(c.changeset.parents):

			




	
	
	
		
 
		                 <div class="parent">${_('Parent')} ${p_cs.revision}: ${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)}

			




	
	
	
		
 
		                 </div>

			




	
	
	
		
 
		             %endfor

			




	
	
	
		
 
                    %else: 

			




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

			




	
	
	
		
 
                    %endif		             

			




	
	
	
		
 
		         <span class="logtags">

			




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

			




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

			




	
	
	
		
 
		             %for tag in c.changeset.tags:

			




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

			




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

			




	
	
	
		
 
		             %endfor

			




	
	
	
		
 
		         </span>                                                                 

			




	
	
	
		
 
	                </div>              

			




	
	
	
		
 
	        </div>

			




	
	
	
		
 
	        <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span>

			




	
	
	
		
 
	        <div class="cs_files">

			




	
	
	
		
 
	                %for change,filenode,diff,cs1,cs2 in c.changes:

			




	
	
	
		
 
	                    <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div>

			




	
	
	
		
 
	                %endfor

			




	
	
	
		
 
	        </div>         

			




	
	
	
		
 
	    </div>

			




	
	
	
		
 
	    

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    	

			




	
	
	
		
 
	%for change,filenode,diff,cs1,cs2 in c.changes:

			




	
	
	
		
 
		%if change !='removed':

			




	
	
	
		
 
		<div style="clear:both;height:10px"></div>

			




	
	
	
		
 
		<div id="body" class="diffblock">

			




	
	
	
		
 
			<div id="${'CHANGE-%s'%filenode.path}" class="code-header">

			




	
	
	
		
 
				<div>

			




	
	
	
		
 
					<span>

			




	
	
	
		
 
				<div class="changeset_header">

			




	
	
	
		
 
					<span class="changeset_file">

			




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

			




	
	
	
		
 
						revision=filenode.changeset.raw_id,f_path=filenode.path))}

			




	
	
	
		
 
					</span>

			




	
	
	
		
 
					%if 1:

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='diff'))}</span>

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('raw diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='raw'))}</span>

			




	
	
	
		
 
					&raquo; <span>${h.link_to(_('download diff'),

			




	
	
	
		
 
					h.url('files_diff_home',repo_name=c.repo_name,f_path=filenode.path,diff2=cs2,diff1=cs1,diff='download'))}</span>

			




	
	
	
		
 
					%endif

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
			<div class="code-body">        

			




	
	
	
		
 
					%if diff:

			




	
	
	
		
 
						${diff|n}

			




	
	
	
		
 
					%else:

			




	
	
	
		
 
						${_('No changes in this file')}

			




	
	
	
		
 
					%endif

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
		</div>

			




	
	
	
		
 
		%endif

			




	
	
	
		
 
	%endfor 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>    

			




	
	
	
		
 
	

			




	
	
	
		
 
</%def>

			




	
	
		
 
\ No newline at end of file

			




        

    


    
    

    

        

                

                    rhodecode/templates/files/file_diff.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



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

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${c.repo_name} ${_('File diff')} - ${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;

			




	
	
	
		
 
    ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} &rarr; r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)}

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="page_nav()">

			




	
	
	
		
 
    ${self.menu('files')}     

			




	
	
	
		
 
</%def>

			




	
	
	
		
 
<%def name="main()">

			




	
	
	
		
 
<div class="box">

			




	
	
	
		
 
    <!-- box / title -->

			




	
	
	
		
 
    <div class="title">

			




	
	
	
		
 
        ${self.breadcrumbs()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <div class="table">

			




	
	
	
		
 
		<div id="body" class="diffblock">

			




	
	
	
		
 
			<div class="code-header">

			




	
	
	
		
 
				<div>

			




	
	
	
		
 
				<span>${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
                <div class="changeset_header">

			




	
	
	
		
 
                <span class="changeset_file">${h.link_to(c.f_path,h.url('files_home',repo_name=c.repo_name,

			




	
	
	
		
 
				revision=c.changeset_2.raw_id,f_path=c.f_path))}</span>

			




	
	
	
		
 
				 &raquo; <span>${h.link_to(_('diff'),

			




	
	
	
		
 
				h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='diff'))}</span>

			




	
	
	
		
 
				 &raquo; <span>${h.link_to(_('raw diff'),

			




	
	
	
		
 
				h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='raw'))}</span>

			




	
	
	
		
 
				 &raquo; <span>${h.link_to(_('download diff'),

			




	
	
	
		
 
				h.url.current(diff2=c.changeset_2.raw_id,diff1=c.changeset_1.raw_id,diff='download'))}</span>

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
			<div class="code-body">

			




	
	
	
		
 
		 			%if c.no_changes:

			




	
	
	
		
 
		            	${_('No changes')}

			




	
	
	
		
 
		            %else:        

			




	
	
	
		
 
						${c.cur_diff|n}

			




	
	
	
		
 
		            %endif

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
		</div>   

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</div>    

			




	
	
	
		
 
</%def>  

			




	
	
	
		
 

			




	
	
	
		
 
   

			




	
	
		
 
\ No newline at end of file

			




        

    



    


    



    



      

      





    
    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.