kallithea Changeset - 0d4fceb91c9c

Changeset - 0d4fceb91c9c

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-08-29 21:56:56
marcin@python-works.com

fixes #24, added generator that generates equally distrybuted colors. Thus skipping creating one large coloring history.

3 files changed with 21 insertions and 10 deletions:

pylons_app/controllers/files.py

pylons_app/lib/app_globals.py

pylons_app/lib/helpers.py

0 comments (0 inline, 0 general)

pylons_app/controllers/files.py

➞

Show inline comments

@@ @@ -18,25 +18,25 @@ @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 """
 Created on April 21, 2010
 files controller for pylons
 @author: marcink
 """
 from mercurial import archival
 from pylons import request, response, session, tmpl_context as c, url
 from pylons.controllers.util import redirect
 from pylons_app.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from pylons_app.lib.base import BaseController, render
-from pylons_app.lib.utils import EmptyChangeset, get_repo_slug
 from pylons_app.lib.utils import EmptyChangeset
 from pylons_app.model.hg_model import HgModel
 from vcs.exceptions import RepositoryError, ChangesetError
 from vcs.nodes import FileNode
 from vcs.utils import diffs as differ
 import logging
 import pylons_app.lib.helpers as h
 import tempfile
 log = logging.getLogger(__name__)
 class FilesController(BaseController):

pylons_app/lib/app_globals.py

➞

Show inline comments

@@ @@ -8,26 +8,24 @@ class Globals(object): @@
     """Globals acts as a container for objects available throughout the
     life of the application
     """
     def __init__(self, config):
         """One instance of Globals is created during application
         initialization and is available during requests via the
         'app_globals' variable
         """
         self.cache = CacheManager(**parse_cache_config_options(config))
         self.changeset_annotation_colors = {}
         self.available_permissions = None   # propagated after init_model
         self.app_title = None               # propagated after init_model
         self.baseui = None                  # propagated after init_model
     @LazyProperty
     def paths(self):
         if self.baseui:
             return self.baseui.configitems('paths')
     @LazyProperty
     def base_path(self):
         if self.baseui:
             return self.paths[0][1].replace('*', '')

pylons_app/lib/helpers.py

➞

Show inline comments

@@ @@ -15,25 +15,24 @@ from webhelpers.html.tags import auto_di @@
     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
 #Custom helpers here :)
 class _Link(object):
     '''
     Make a url based on label and url with help of url_for
     @param label:name of link    if not defined url is used
     @param url: the url for link
     '''
     def __call__(self, label='', *url_, **urlargs):
         if label is None or '':
             label = url
         link_fn = link_to(label, url(*url_, **urlargs))
@@ @@ -220,44 +219,58 @@ def pygmentize(filenode, **kwargs): @@
     pygmentize function using pygments
     @param filenode:
     """
     return literal(code_highlight(filenode.content,
                                   filenode.lexer, HtmlFormatter(**kwargs)))
 def pygmentize_annotation(filenode, **kwargs):
     """
     pygmentize function for annotation
     @param filenode:
     """
-    color_dict = g.changeset_annotation_colors
+    color_dict = {}
     def gen_color():
         import random
         return [str(random.randrange(10, 235)) for _ in xrange(3)]
         """generator for getting 10k of evenly distibuted colors using hsv color
         and golden ratio.
         """
         import colorsys
         n = 10000
         golden_ratio = 0.618033988749895
         h = 0.22717784590367374
         #generate 10k nice web friendly colors in the same order
         for c in xrange(n):
             h +=golden_ratio
             h %= 1
             HSV_tuple = [h, 0.95, 0.95]
             RGB_tuple = colorsys.hsv_to_rgb(*HSV_tuple)
             yield map(lambda x:str(int(x*256)),RGB_tuple)
     cgenerator = gen_color()
     def get_color_string(cs):
         if color_dict.has_key(cs):
             col = color_dict[cs]
         else:
             color_dict[cs] = gen_color()
             col = color_dict[cs]
             col = color_dict[cs] = cgenerator.next()
         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,
+        lnk_format = 'r%-5s:%s' % (changeset.revision,
                                  changeset.raw_id)
         uri = link_to(
                 lnk_format,
                 url('changeset_home', repo_name=changeset.repository.name,
                     revision=changeset.raw_id),
                 style=get_color_string(changeset.raw_id),
                 class_='tooltip',
                 tooltip_title=tooltip_html
+              )
         uri += '\n'
         return uri

0 comments (0 inline, 0 general)