Changeset - b80c2f617d44
Parent rev.
Child rev.
[Not reviewed]
beta
0 3 0
Marcin Kuzminski - 13 years ago 2012-06-08 02:50:47
marcin@python-works.com
removed wrap paragraphs from commit messages as it broke formatting.
- commits are still properly formatted by css
3 files changed with 3 insertions and 3 deletions:
rhodecode/templates/changelog/changelog.html
1
1
rhodecode/templates/changeset/changeset.html
1
1
rhodecode/templates/changeset/changeset_range.html
1
1
0 comments (0 inline, 0 general)
rhodecode/templates/changelog/changelog.html
➞
Show inline comments
 
@@ -15,97 +15,97 @@ ${_('%s Changelog') % c.repo_name} - ${c
 
    ${_('Changelog')} - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
 
</%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.shorter(h.person(cs.author),22)}</div>

			




	
	
	
		
 
							</div>

			




	
	
	
		
 
                            <div class="date">${h.fmt_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="message">${h.urlify_commit(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 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>

			




	
	
	
		
 
								   %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

			




	
	
	
		
 
                                    %if h.is_hg(c.rhodecode_repo):

			




	
	
	
		
 
                                      %for book in cs.bookmarks:

			




	
	
	
		
 
                                      <span class="bookbook" title="${'%s %s' % (_('bookmark'),book)}">

			




	
	
	
		
 
                                         ${h.link_to(h.shorter(book),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}

			




	
	
	
		
 
                                      </span>

			




	
	
	
		
 
                                      %endfor

			




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

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -7,97 +7,97 @@

			




	
	
	
		
 
</%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')} - <span class='hash'>r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}</span>

			




	
	
	
		
 
</%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 class="diffblock">

			




	
	
	
		
 
			<div class="code-header">

			




	
	
	
		
 
                <div class="hash">

			




	
	
	
		
 
                 r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="date">

			




	
	
	
		
 
                  ${h.fmt_date(c.changeset.date)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <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')}" class="tooltip"><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')}" class="tooltip"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>

			




	
	
	
		
 
                  ${c.ignorews_url(request.GET)}

			




	
	
	
		
 
                  ${c.context_url(request.GET)}

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="comments-number" style="float:right;padding-right:5px">${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}</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/>

			




	
	
	
		
 
	                 </div>

			




	
	
	
		
 
	                 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message),c.repo_name)}</div>

			




	
	
	
		
 
	                 <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div>

			




	
	
	
		
 
	             </div>

			




	
	
	
		
 
	             <div class="right">

			




	
	
	
		
 
		             <div class="changes">

			




	
	
	
		
 
                        % if len(c.changeset.affected_files) <= c.affected_files_cut_off:

			




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

			




	
	
	
		
 
	                    % else:

			




	
	
	
		
 
                         <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
                         <span class="added"   title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>

			




	
	
	
		
 
	                    % endif

			




	
	
	
		
 
		             </div>

			




	
	
	
		
 

			




	
	
	
		
 
		            %if c.changeset.parents:

			




	
	
	
		
 
		             %for p_cs in reversed(c.changeset.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(c.changeset.parents)>1:

			




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

			




	
	
	
		
 
                 %endif

			




	
	
	
		
 
		             %if c.changeset.branch:

			




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

			




	
	
	
		
 
                     %endif

			




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

			




	
	
	
		
 
	        ${_('%s files affected with %s insertions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}

			




	
	
	
		
 
	        </span>

			




	
	
	
		
 
	        <div class="cs_files">

			




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

			




	
	
	
		
 
	                    <div class="cs_${change}">

			




	
	
	
		
 
                            <div class="node">

			




	
	
	
		
 
                            %if change != 'removed':

			




        

    


    
    

    

        

                

                    rhodecode/templates/changeset/changeset_range.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
## -*- coding: utf-8 -*-

			




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

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="title()">

			




	
	
	
		
 
    ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].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;

			




	
	
	
		
 
    ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].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 cv">

			




	
	
	
		
 
		        <h3 class="code-header-title">${_('Compare View')}</h3>

			




	
	
	
		
 
                <div>

			




	
	
	
		
 
				${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}

			




	
	
	
		
 
				</div>

			




	
	
	
		
 
			</div>

			




	
	
	
		
 
		</div>

			




	
	
	
		
 
	    <div id="changeset_compare_view_content">

			




	
	
	
		
 
			<div class="container">

			




	
	
	
		
 
			<table class="compare_view_commits noborder">

			




	
	
	
		
 
            %for cs in c.cs_ranges:

			




	
	
	
		
 
                <tr>

			




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

			




	
	
	
		
 
                <td>${h.link_to('r%s:%s' % (cs.revision,h.short_id(cs.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</td>

			




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

			




	
	
	
		
 
                <td><span class="tooltip" title="${h.age(cs.date)}">${h.fmt_date(cs.date)}</span></td>

			




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

			




	
	
	
		
 
                <td><div class="message">${h.urlify_commit(cs.message, c.repo_name)}</div></td>

			




	
	
	
		
 
                </tr>

			




	
	
	
		
 
            %endfor

			




	
	
	
		
 
            </table>

			




	
	
	
		
 
	        </div>

			




	
	
	
		
 
	        <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${_('Files affected')}</div>

			




	
	
	
		
 
	        <div class="cs_files">

			




	
	
	
		
 
	               %for cs in c.cs_ranges:

			




	
	
	
		
 
	                   <div class="cur_cs">r${cs}</div>

			




	
	
	
		
 
	                %for change,filenode,diff,cs1,cs2,st in c.changes[cs.raw_id]:

			




	
	
	
		
 
	                    <div class="cs_${change}">${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID(cs.raw_id,filenode.path)))}</div>

			




	
	
	
		
 
	                %endfor

			




	
	
	
		
 
	               %endfor

			




	
	
	
		
 
	        </div>

			




	
	
	
		
 
	    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
     %for cs in c.cs_ranges:

			




	
	
	
		
 
          ##${comment.comment_inline_form(cs)}

			




	
	
	
		
 
          ## diff block

			




	
	
	
		
 
          <h3 style="border:none;padding-top:8px;">${'r%s:%s' % (cs.revision,h.short_id(cs.raw_id))}</h3>

			




	
	
	
		
 
          ${diff_block.diff_block(c.changes[cs.raw_id])}

			




	
	
	
		
 
          ##${comment.comments(cs)}

			




	
	
	
		
 

			




	
	
	
		
 
     %endfor

			




	
	
	
		
 
     <script type="text/javascript">

			




	
	
	
		
 

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.diff-menu-activate'),'click',function(e){

			




	
	
	
		
 
              var act = e.currentTarget.nextElementSibling;

			




	
	
	
		
 

			




	
	
	
		
 
              if(YUD.hasClass(act,'active')){

			




	
	
	
		
 
                  YUD.removeClass(act,'active');

			




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

			




	
	
	
		
 
              }else{

			




	
	
	
		
 
                  YUD.addClass(act,'active');

			




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

			




	
	
	
		
 
              }

			




	
	
	
		
 
          });

			




	
	
	
		
 
      })

			




	
	
	
		
 
    </script>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    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.