Changeset - b1debb6c5a09
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Marcin Kuzminski - 15 years ago 2010-08-08 02:40:10
marcin@python-works.com
implemented gravatars to changesets, updated styling for changesets
added email_or_none filter to webhelpers
3 files changed with 13 insertions and 4 deletions:
pylons_app/lib/helpers.py
3
2
pylons_app/public/css/style.css
3
1
pylons_app/templates/changelog/changelog.html
7
1
0 comments (0 inline, 0 general)
pylons_app/lib/helpers.py
➞
Show inline comments
 
@@ -239,84 +239,85 @@ def pygmentize_annotation(filenode, **kw
 
            color_dict[cs] = gen_color()
 
            col = color_dict[cs]
 
        return "color: rgb(%s) ! important;" % (', '.join(col))
 
 
    def url_func(changeset):
 
        tooltip_html = "<div style='font-size:0.8em'><b>Author:</b> %s<br/><b>Date:</b> %s</b><br/><b>Message:</b> %s<br/></div>"
 
 
        tooltip_html = tooltip_html % (changeset.author,
 
                                               changeset.date,
 
                                               tooltip(changeset.message))
 
        lnk_format = 'r%s:%s' % (changeset.revision,
 
                                 changeset.raw_id)
 
        uri = link_to(
 
                lnk_format,
 
                url('changeset_home', repo_name='test',
 
                    revision=changeset.raw_id),
 
                style=get_color_string(changeset.raw_id),
 
                class_='tooltip',
 
                tooltip_title=tooltip_html
 
              )
 
 
        uri += '\n'
 
        return uri
 
    return literal(annotate_highlight(filenode, url_func, **kwargs))
 
 
def repo_name_slug(value):
 
    """
 
    Return slug of name of repository
 
    """
 
    slug = urlify(value)
 
    for c in """=[]\;'"<>,/~!@#$%^&*()+{}|:""":
 
        slug = slug.replace(c, '-')
 
    slug = recursive_replace(slug, '-')
 
    return slug
 

			




	
	
	
		
 
flash = _Flash()

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 
# MERCURIAL FILTERS available via h.

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 
from mercurial import util

			




	
	
	
		
 
from mercurial.templatefilters import age as _age, person as _person

			




	
	
	
		
 

			




	
	
	
		
 
age = lambda  x:_age(x)

			




	
	
	
		
 
capitalize = lambda x: x.capitalize()

			




	
	
	
		
 
date = lambda x: util.datestr(x)

			




	
	
	
		
 
email = util.email

			




	
	
	
		
 
email_or_none = lambda x: util.email(x) if util.email(x) != x else None

			




	
	
	
		
 
person = lambda x: _person(x)

			




	
	
	
		
 
hgdate = lambda  x: "%d %d" % x

			




	
	
	
		
 
isodate = lambda  x: util.datestr(x, '%Y-%m-%d %H:%M %1%2')

			




	
	
	
		
 
isodatesec = lambda  x: util.datestr(x, '%Y-%m-%d %H:%M:%S %1%2')

			




	
	
	
		
 
localdate = lambda  x: (x[0], util.makedate()[1])

			




	
	
	
		
 
rfc822date = lambda  x: util.datestr(x, "%a, %d %b %Y %H:%M:%S %1%2")

			




	
	
	
		
 
rfc3339date = lambda  x: util.datestr(x, "%Y-%m-%dT%H:%M:%S%1:%2")

			




	
	
	
		
 
time_ago = lambda x: util.datestr(_age(x), "%a, %d %b %Y %H:%M:%S %1%2")

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 
# PERMS

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 
from pylons_app.lib.auth import HasPermissionAny, HasPermissionAll, \

			




	
	
	
		
 
HasRepoPermissionAny, HasRepoPermissionAll

			




	
	
	
		
 

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 
# GRAVATAR URL

			




	
	
	
		
 
#===============================================================================

			




	
	
	
		
 
import hashlib

			




	
	
	
		
 
import urllib

			




	
	
	
		
 
from pylons import request

			




	
	
	
		
 

			




	
	
	
		
 
def gravatar_url(email, size=30):

			




	
	
	
		
 
def gravatar_url(email_address, size=30):

			




	
	
	
		
 
    ssl_enabled = 'https' == request.environ.get('HTTP_X_URL_SCHEME')

			




	
	
	
		
 
    default = 'identicon'

			




	
	
	
		
 
    baseurl_nossl = "http://www.gravatar.com/avatar/"

			




	
	
	
		
 
    baseurl_ssl = "https://secure.gravatar.com/avatar/"

			




	
	
	
		
 
    baseurl = baseurl_ssl if ssl_enabled else baseurl_nossl

			




	
	
	
		
 
        

			




	
	
	
		
 
    

			




	
	
	
		
 
    # construct the url

			




	
	
	
		
 
    gravatar_url = baseurl + hashlib.md5(email.lower()).hexdigest() + "?"

			




	
	
	
		
 
    gravatar_url = baseurl + hashlib.md5(email_address.lower()).hexdigest() + "?"

			




	
	
	
		
 
    gravatar_url += urllib.urlencode({'d':default, 's':str(size)})

			




	
	
	
		
 

			




	
	
	
		
 
    return gravatar_url

			




        

    


    
    

    

        

                

                    pylons_app/public/css/style.css
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -2914,122 +2914,124 @@ div.form div.fields div.buttons input

			




	
	
	
		
 
	text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.cs_files .cs_removed {

			




	
	
	
		
 
	background: url("/images/icons/page_white_delete.png") no-repeat scroll

			




	
	
	
		
 
		3px;

			




	
	
	
		
 
	/*background-color: #FF8888;*/

			




	
	
	
		
 
	height: 16px;

			




	
	
	
		
 
	padding-left: 20px;

			




	
	
	
		
 
	margin-top: 7px;

			




	
	
	
		
 
	text-align: left;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
/* -----------------------------------------------------------

			




	
	
	
		
 
	CHANGESETS - CANVAS

			




	
	
	
		
 
----------------------------------------------------------- */

			




	
	
	
		
 

			




	
	
	
		
 
#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 #CCCCCC;

			




	
	
	
		
 
	padding:10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .wrapper {

			




	
	
	
		
 
	width: 600px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container {

			




	
	
	
		
 
	border-bottom: 1px solid #CCCCCC;

			




	
	
	
		
 
	border-left: 1px solid #CCCCCC;

			




	
	
	
		
 
	border-right: 1px solid #CCCCCC;

			




	
	
	
		
 
	min-height: 80px;

			




	
	
	
		
 
	min-height: 90px;

			




	
	
	
		
 
	overflow: hidden;

			




	
	
	
		
 
	font-size:1.2em;	

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .left {

			




	
	
	
		
 
	float: left;

			




	
	
	
		
 
	width: 70%;

			




	
	
	
		
 
	padding-left: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .right {

			




	
	
	
		
 
	float: right;

			




	
	
	
		
 
	width: 25%;

			




	
	
	
		
 
	text-align: right;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .left .date {

			




	
	
	
		
 
	font-weight: bold;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .left .author {

			




	
	
	
		
 
	

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#graph_content .container .left .message {

			




	
	
	
		
 
	font-size: 100%;

			




	
	
	
		
 
	padding-top: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right div {

			




	
	
	
		
 
	clear: both;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .added,.changed,.removed {

			




	
	
	
		
 
	border: 1px solid #DDDDDD;

			




	
	
	
		
 
	display: block;

			




	
	
	
		
 
	float: right;

			




	
	
	
		
 
	font-size: 0.75em;

			




	
	
	
		
 
	text-align: center;

			




	
	
	
		
 
	min-width: 15px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .added {

			




	
	
	
		
 
	background: #BBFFBB;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .changed {

			




	
	
	
		
 
	background: #FFDD88;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .changes .removed {

			




	
	
	
		
 
	background: #FF8888;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .merge {

			




	
	
	
		
 
	vertical-align: top;

			




	
	
	
		
 
	font-size: 60%;

			




	
	
	
		
 
	font-weight: bold;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .merge img {

			




	
	
	
		
 
	vertical-align: bottom;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.right .parent {

			




	
	
	
		
 
	font-size: 90%;

			




	
	
	
		
 
	font-family: monospace;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
/* -----------------------------------------------------------

			




	
	
	
		
 
	FILE BROWSER

			




	
	
	
		
 
----------------------------------------------------------- */

			




	
	
	
		
 
div.browserblock {

			




        

    


    
    

    

        

                

                    pylons_app/templates/changelog/changelog.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -6,97 +6,103 @@

			




	
	
	
		
 

			




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

			




	
	
	
		
 
          <span>${_('Show')}:</span>

			




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

			




	
	
	
		
 
          <span>${_('revisions')}</span>

			




	
	
	
		
 
          ${h.submit('set',_('set'))}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
						

			




	
	
	
		
 
					</div>

			




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

			




	
	
	
		
 
					<div id="chg_${cnt+1}" class="container">

			




	
	
	
		
 
						<div class="left">

			




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

			




	
	
	
		
 
								<span class="logtags">

			




	
	
	
		
 
									<span class="branchtag">${cs.branch}</span>

			




	
	
	
		
 
									%for tag in cs.tags:

			




	
	
	
		
 
										<span class="tagtag">${tag}</span>

			




	
	
	
		
 
									%endfor

			




	
	
	
		
 
								</span>					

			




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

			




	
	
	
		
 
							<div class="author">

			




	
	
	
		
 
								<div class="gravatar">

			




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

			




	
	
	
		
 
								</div>

			




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

			




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

			




	
	
	
		
 
							</div>

			




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

			




	
	
	
		
 
						<div class="right">

			




	
	
	
		
 
									<div class="changes">

			




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

			




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

			




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

			




	
	
	
		
 
									</div>					

			




	
	
	
		
 
										%if len(cs.parents)>1:

			




	
	
	
		
 
										<div class="merge">

			




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

			




	
	
	
		
 
										</div>

			




	
	
	
		
 
										%endif						

			




	
	
	
		
 
									%for p_cs in reversed(cs.parents):

			




	
	
	
		
 
										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,

			




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

			




	
	
	
		
 
										</div>

			




	
	
	
		
 
									%endfor								

			




	
	
	
		
 
						</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="/js/graph.js"></script>

			




	
	
	
		
 
			<script type="text/javascript">

			




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

			




	
	
	
		
 
					function set_canvas() {

			




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

			




	
	
	
		
 
						canvas.setAttribute('width',160);

			




	
	
	
		
 
					};

			




	
	
	
		
 
					set_canvas();

			




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

			




	
	
	
		
 
					var r = new BranchRenderer();

			




	
	
	
		
 
					r.render(jsdata); 

			




	
	
	
		
 
				});

			




        

    



    


    



    



      

      





    
    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.