kallithea Changeset - 39b49c999efb

Changeset - 39b49c999efb

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Marcin Kuzminski - 14 years ago 2011-12-08 00:23:11
marcin@python-works.com

fixes issue #320.
- added mapping of commit users into rhodecode users

5 files changed with 42 insertions and 7 deletions:

rhodecode/lib/helpers.py

rhodecode/templates/changelog/changelog.html

rhodecode/templates/files/files_annotate.html

rhodecode/templates/files/files_browser.html

rhodecode/templates/files/files_source.html

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -17,49 +17,48 @@ from pylons.i18n.translation import _, u @@
 from webhelpers.html import literal, HTML, escape
 from webhelpers.html.tools import *
 from webhelpers.html.builder import make_tag
 from webhelpers.html.tags import auto_discovery_link, checkbox, css_classes, \
     end_form, file, form, hidden, image, javascript_link, link_to, link_to_if, \
     link_to_unless, ol, required_legend, select, stylesheet_link, submit, text, \
     password, textarea, title, ul, xml_declaration, radio
 from webhelpers.html.tools import auto_link, button_to, highlight, js_obfuscate, \
     mail_to, strip_links, strip_tags, tag_re
 from webhelpers.number import format_byte_size, format_bit_size
 from webhelpers.pylonslib import Flash as _Flash
 from webhelpers.pylonslib.secure_form import secure_form
 from webhelpers.text import chop_at, collapse, convert_accented_entities, \
     convert_misc_entities, lchop, plural, rchop, remove_formatting, \
     replace_whitespace, urlify, truncate, wrap_paragraphs
 from webhelpers.date import time_ago_in_words
 from webhelpers.paginate import Page
 from webhelpers.html.tags import _set_input_attrs, _set_id_attr, \
     convert_boolean_attrs, NotGiven, _make_safe_id_component
 from rhodecode.lib.annotate import annotate_highlight
 from rhodecode.lib.utils import repo_name_slug
 from rhodecode.lib import str2bool, safe_unicode, safe_str, get_changeset_safe
 from rhodecode.lib.markup_renderer import MarkupRenderer
 def _reset(name, value=None, id=NotGiven, type="reset", **attrs):
     """
     Reset button
     """
     _set_input_attrs(attrs, type, name, value)
     _set_id_attr(attrs, id, name)
     convert_boolean_attrs(attrs, ["disabled"])
     return HTML.input(**attrs)
 reset = _reset
 safeid = _make_safe_id_component
 def get_token():
     """Return the current authentication token, creating one if one doesn't
     already exist.
     """
     token_key = "_authentication_token"
     from pylons import session
     if not token_key in session:
         try:
             token = hashlib.sha1(str(random.getrandbits(128))).hexdigest()
         except AttributeError: # Python < 2.4
@@ @@ -267,57 +266,92 @@ def pygmentize_annotation(repo_name, fil @@
                     url('changeset_home', repo_name=repo_name,
                         revision=changeset.raw_id),
                     style=get_color_string(changeset.raw_id),
                     class_='tooltip',
                     title=tooltip_html
+                  )
             uri += '\n'
             return uri
         return _url_func
     return literal(annotate_highlight(filenode, url_func(repo_name), **kwargs))
 def is_following_repo(repo_name, user_id):
     from rhodecode.model.scm import ScmModel
     return ScmModel().is_following_repo(repo_name, user_id)
 flash = _Flash()
 #==============================================================================
 # SCM FILTERS available via h.
 #==============================================================================
 from vcs.utils import author_name, author_email
 from rhodecode.lib import credentials_filter, age as _age
 from rhodecode.model.db import User
 age = lambda  x:_age(x)
 capitalize = lambda x: x.capitalize()
 email = author_email
 email_or_none = lambda x: email(x) if email(x) != x else None
 person = lambda x: author_name(x)
 short_id = lambda x: x[:12]
 hide_credentials = lambda x: ''.join(credentials_filter(x))
 def email_or_none(x):
     if email(x) != '':
         return email(x)
     # See if it contains a username we can get an email from
     user = User.get_by_username(author_name(x), case_insensitive=True,
                                 cache=True)
     if user is not None:
         return user.email
     # No valid email, not a valid user in the system, none!
     return None
 def person(x):
     # Valid email in the attribute passed, see if they're in the system
     # attr to return from fetched user
     person_getter = lambda usr: usr.username
     if email(x) != '':
         user = User.get_by_email(email(x), case_insensitive=True, cache=True)
         if user is not None:
             return person_getter(user)
         return email(x)
     # Maybe it's a username?
     user = User.get_by_username(author_name(x), case_insensitive=True,
                                 cache=True)
     if user is not None:
         return person_getter(user)
     # Still nothing?  Just pass back the author name then
     return author_name(x)
 def bool2icon(value):
     """Returns True/False values represented as small html image of true/false
     icons
     :param value: bool value
     """
     if value is True:
         return HTML.tag('img', src=url("/images/icons/accept.png"),
                         alt=_('True'))
     if value is False:
         return HTML.tag('img', src=url("/images/icons/cancel.png"),
                         alt=_('False'))
     return value
 def action_parser(user_log, feed=False):
     """This helper will action_map the specified string action into translated
     fancy names with icons and links
     :param user_log: user log instance
     :param feed: use output for feeds (no html and fancy icons)

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -33,50 +33,49 @@ ${c.repo_name} ${_('Changelog')} - ${c.r @@
 				<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)}
 				          <span class="rev">${_('revisions')}</span>
 				        </div>
 				        ${h.end_form()}
                     <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
 					<div id="rev_range_container" style="display:none"></div>
 					</div>
 				%for cnt,cs in enumerate(c.pagination):
 					<div id="chg_${cnt+1}" class="container">
 						<div class="left">
 							<div class="date">
 							${h.checkbox(cs.short_id,class_="changeset_range")}
 							<span>${_('commit')} ${cs.revision}: ${h.short_id(cs.raw_id)}@${cs.date}</span>
 							</div>
 							<div class="author">
 								<div class="gravatar">
 									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),16)}"/>
 								</div>
 								<div title="${h.email_or_none(cs.author)}" class="user">${h.person(cs.author)}</div>
 								##<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>
 								<div title="${cs.author}" class="user">${h.person(cs.author)}</div>
 							</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 id="${cs.raw_id}_changes_info" class="changes">
                                         <span id="${cs.raw_id}" class="changed_total tooltip" title="${_('Affected number of files, click to show more details')}">${len(cs.affected_files)}</span>
 									</div>
 										%if len(cs.parents)>1:
 										<div class="merge">${_('merge')}</div>
 										%endif
 								   %if cs.parents:
 									%for p_cs in reversed(cs.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">
 									%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>

rhodecode/templates/files/files_annotate.html

➞

Show inline comments

@@ @@ -43,49 +43,49 @@ @@
 			    </dd>
 			</dl>
 			<div id="body" class="codeblock">
                 <div class="code-header">
                     <div class="stats">
                         <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div>
                         <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div>
                         <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
                         <div class="left item last">${c.file.mimetype}</div>
                         <div class="buttons">
                           ${h.link_to(_('show source'),h.url('files_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                           ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                           ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                           % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                            % if not c.file.is_binary:
                             ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.cs.raw_id,f_path=c.f_path),class_="ui-btn")}
                            % endif
                           % endif
                         </div>
                     </div>
                     <div class="author">
                         <div class="gravatar">
                             <img alt="gravatar" src="${h.gravatar_url(h.email(c.cs.author),16)}"/>
                         </div>
-                        <div title="${h.email_or_none(c.cs.author)}" class="user">${h.person(c.cs.author)}</div>
                         <div title="${c.cs.author}" class="user">${h.person(c.cs.author)}</div>
                     </div>
                     <div class="commit">${c.file.last_changeset.message}</div>
                 </div>
 				<div class="code-body">
 			       %if c.file.is_binary:
 			           ${_('Binary file (%s)') % c.file.mimetype}
 			       %else:
 					% if c.file.size < c.cut_off_limit:
 						${h.pygmentize_annotation(c.repo_name,c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
 					%else:
 						${_('File is too big to display')} ${h.link_to(_('show as raw'),
 						h.url('files_raw_home',repo_name=c.repo_name,revision=c.cs.revision,f_path=c.f_path))}
 					%endif
 			       <script type="text/javascript">
 			           function highlight_lines(lines){
 			               for(pos in lines){
 			                 YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE');
+			               }
+			           }
 			           page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L');
 			           if (page_highlights.length == 2){
 			              highlight_ranges  = page_highlights[1].split(",");
 			              var h_lines = [];

rhodecode/templates/files/files_browser.html

➞

Show inline comments

@@ @@ -75,35 +75,37 @@ @@
 		             <td>
 		             %if node.is_file():
 		             	${h.format_byte_size(node.size,binary=True)}
 		             %endif
 		             </td>
 		             <td>
 		              %if node.is_file():
 		                  ${node.mimetype}
 		              %endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		<span class="tooltip" title="${node.last_changeset.message}">
 		             		${'r%s:%s' % (node.last_changeset.revision,node.last_changeset.short_id)}</span>
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		<span class="tooltip" title="${node.last_changeset.date}">
                             ${h.age(node.last_changeset.date)}</span>
 		             	%endif
 		             </td>
 		             <td>
 		             	%if node.is_file():
 		             		${node.last_changeset.author}
 		             		<span title="${node.last_changeset.author}">
                             ${h.person(node.last_changeset.author)}
                             </span>
 		             	%endif
 		             </td>
 				</tr>
 			%endfor
                 </tbody>
                 <tbody id="tbody_filtered" style="display:none">
                 </tbody>
 		</table>
 	</div>
 </div>
@@ \ No newline at end of file @@

rhodecode/templates/files/files_source.html

➞

Show inline comments

@@ @@ -14,49 +14,49 @@ @@
 <div id="body" class="codeblock">
 	<div class="code-header">
         <div class="stats">
             <div class="left"><img src="${h.url('/images/icons/file.png')}"/></div>
             <div class="left item">${h.link_to("r%s:%s" % (c.file.last_changeset.revision,h.short_id(c.file.last_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.last_changeset.raw_id))}</div>
             <div class="left item">${h.format_byte_size(c.file.size,binary=True)}</div>
             <div class="left item last">${c.file.mimetype}</div>
             <div class="buttons">
               ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
               ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
               ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
               % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
                % if not c.file.is_binary:
                 ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
                % endif
               % endif
             </div>
         </div>
         <div class="author">
             <div class="gravatar">
                 <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),16)}"/>
             </div>
-            <div title="${h.email_or_none(c.changeset.author)}" class="user">${h.person(c.changeset.author)}</div>
             <div title="${c.changeset.author}" class="user">${h.person(c.changeset.author)}</div>
         </div>
 		<div class="commit">${c.file.last_changeset.message}</div>
 	</div>
 	<div class="code-body">
 	   %if c.file.is_binary:
 	       ${_('Binary file (%s)') % c.file.mimetype}
 	   %else:
 		% if c.file.size < c.cut_off_limit:
 			${h.pygmentize(c.file,linenos=True,anchorlinenos=True,lineanchors='L',cssclass="code-highlight")}
 		%else:
 			${_('File is too big to display')} ${h.link_to(_('show as raw'),
 			h.url('files_raw_home',repo_name=c.repo_name,revision=c.changeset.raw_id,f_path=c.f_path))}
 		%endif
        <script type="text/javascript">
            function highlight_lines(lines){
                for(pos in lines){
                  YUD.setStyle('L'+lines[pos],'background-color','#FFFFBE');
+               }
+           }
            page_highlights = location.href.substring(location.href.indexOf('#')+1).split('L');
            if (page_highlights.length == 2){
               highlight_ranges  = page_highlights[1].split(",");
               var h_lines = [];

0 comments (0 inline, 0 general)