kallithea Changeset - ed48d17836a4

Changeset - ed48d17836a4

Parent rev.

Child rev.

[Not reviewed]

beta

0 4 0

Leonardo - 13 years ago 2013-03-07 14:48:23
leo@unity3d.com

WIP: Changelog view

4 files changed with 245 insertions and 124 deletions:

rhodecode/lib/helpers.py

rhodecode/lib/utils2.py

rhodecode/public/css/style.css

175

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -270,193 +270,193 @@ def pygmentize_annotation(repo_name, fil @@
     :param filenode:
     """
     color_dict = {}
     def gen_color(n=10000):
         """generator for getting n of evenly distributed colors using
         hsv color and golden ratio. It always return same order of colors
         :returns: RGB tuple
         """
         def hsv_to_rgb(h, s, v):
             if s == 0.0:
                 return v, v, v
             i = int(h * 6.0)  # XXX assume int() truncates!
             f = (h * 6.0) - i
             p = v * (1.0 - s)
             q = v * (1.0 - s * f)
             t = v * (1.0 - s * (1.0 - f))
             i = i % 6
             if i == 0:
                 return v, t, p
             if i == 1:
                 return q, v, p
             if i == 2:
                 return p, v, t
             if i == 3:
                 return p, q, v
             if i == 4:
                 return t, p, v
             if i == 5:
                 return v, p, q
         golden_ratio = 0.618033988749895
         h = 0.22717784590367374
         for _ in xrange(n):
             h += golden_ratio
             h %= 1
             HSV_tuple = [h, 0.95, 0.95]
             RGB_tuple = hsv_to_rgb(*HSV_tuple)
             yield map(lambda x: str(int(x * 256)), RGB_tuple)
     cgenerator = gen_color()
     def get_color_string(cs):
         if cs in color_dict:
             col = color_dict[cs]
         else:
             col = color_dict[cs] = cgenerator.next()
         return "color: rgb(%s)! important;" % (', '.join(col))
     def url_func(repo_name):
         def _url_func(changeset):
             author = changeset.author
             date = changeset.date
             message = tooltip(changeset.message)
             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 % (author, date, message)
             lnk_format = '%5s:%s' % ('r%s' % changeset.revision,
                                      short_id(changeset.raw_id))
             uri = link_to(
                     lnk_format,
                     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 rhodecode.lib.vcs.utils import author_name, author_email
 from rhodecode.lib.utils2 import credentials_filter, age as _age
 from rhodecode.model.db import User, ChangesetStatus
 age = lambda  x: _age(x)
+age = lambda  x,y=False: _age(x,y)
 capitalize = lambda x: x.capitalize()
 email = author_email
 short_id = lambda x: x[:12]
 hide_credentials = lambda x: ''.join(credentials_filter(x))
 def fmt_date(date):
     if date:
         _fmt = _(u"%a, %d %b %Y %H:%M:%S").encode('utf8')
         return date.strftime(_fmt).decode('utf8')
     return ""
 def is_git(repository):
     if hasattr(repository, 'alias'):
         _type = repository.alias
     elif hasattr(repository, 'repo_type'):
         _type = repository.repo_type
     else:
         _type = repository
     return _type == 'git'
 def is_hg(repository):
     if hasattr(repository, 'alias'):
         _type = repository.alias
     elif hasattr(repository, 'repo_type'):
         _type = repository.repo_type
     else:
         _type = repository
     return _type == 'hg'
 def email_or_none(author):
     # extract email from the commit string
     _email = email(author)
     if _email != '':
         # check it against RhodeCode database, and use the MAIN email for this
         # user
         user = User.get_by_email(_email, case_insensitive=True, cache=True)
         if user is not None:
             return user.email
         return _email
     # See if it contains a username we can get an email from
     user = User.get_by_username(author_name(author), 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(author, show_attr="username_and_name"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)
     # Valid email in the attribute passed, see if they're in the system
     _email = email(author)
     if _email != '':
         user = User.get_by_email(_email, case_insensitive=True, cache=True)
         if user is not None:
             return person_getter(user)
         return _email
     # Maybe it's a username?
     _author = author_name(author)
     user = User.get_by_username(_author, 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
 def person_by_id(id_, show_attr="username_and_name"):
     # attr to return from fetched user
     person_getter = lambda usr: getattr(usr, show_attr)
     #maybe it's an ID ?
     if str(id_).isdigit() or isinstance(id_, int):
         id_ = int(id_)
         user = User.get(id_)
         if user is not None:
             return person_getter(user)
     return id_
 def desc_stylize(value):
     """
     converts tags from value into html equivalent
     :param value:

rhodecode/lib/utils2.py

➞

Show inline comments

@@ @@ -256,267 +256,271 @@ def safe_str(unicode_, to_encoding=None) @@
         DEFAULT_ENCODINGS = aslist(rhodecode.CONFIG.get('default_encoding',
                                                         'utf8'), sep=',')
         to_encoding = DEFAULT_ENCODINGS
     if not isinstance(to_encoding, (list, tuple)):
         to_encoding = [to_encoding]
     for enc in to_encoding:
         try:
             return unicode_.encode(enc)
         except UnicodeEncodeError:
             pass
     try:
         import chardet
         encoding = chardet.detect(unicode_)['encoding']
         if encoding is None:
             raise UnicodeEncodeError()
         return unicode_.encode(encoding)
     except (ImportError, UnicodeEncodeError):
         return unicode_.encode(to_encoding[0], 'replace')
     return safe_str
 def remove_suffix(s, suffix):
     if s.endswith(suffix):
         s = s[:-1 * len(suffix)]
     return s
 def remove_prefix(s, prefix):
     if s.startswith(prefix):
         s = s[len(prefix):]
     return s
 def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
     """
     Custom engine_from_config functions that makes sure we use NullPool for
     file based sqlite databases. This prevents errors on sqlite. This only
     applies to sqlalchemy versions < 0.7.0
     """
     import sqlalchemy
     from sqlalchemy import engine_from_config as efc
     import logging
     if int(sqlalchemy.__version__.split('.')[1]) < 7:
         # This solution should work for sqlalchemy < 0.7.0, and should use
         # proxy=TimerProxy() for execution time profiling
         from sqlalchemy.pool import NullPool
         url = configuration[prefix + 'url']
         if url.startswith('sqlite'):
             kwargs.update({'poolclass': NullPool})
         return efc(configuration, prefix, **kwargs)
     else:
         import time
         from sqlalchemy import event
         from sqlalchemy.engine import Engine
         log = logging.getLogger('sqlalchemy.engine')
         BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38)
         engine = efc(configuration, prefix, **kwargs)
         def color_sql(sql):
             COLOR_SEQ = "\033[1;%dm"
             COLOR_SQL = YELLOW
             normal = '\x1b[0m'
             return ''.join([COLOR_SEQ % COLOR_SQL, sql, normal])
         if configuration['debug']:
             #attach events only for debug configuration
             def before_cursor_execute(conn, cursor, statement,
                                     parameters, context, executemany):
                 context._query_start_time = time.time()
                 log.info(color_sql(">>>>> STARTING QUERY >>>>>"))
             def after_cursor_execute(conn, cursor, statement,
                                     parameters, context, executemany):
                 total = time.time() - context._query_start_time
                 log.info(color_sql("<<<<< TOTAL TIME: %f <<<<<" % total))
             event.listen(engine, "before_cursor_execute",
                          before_cursor_execute)
             event.listen(engine, "after_cursor_execute",
                          after_cursor_execute)
     return engine
 def age(prevdate):
+def age(prevdate, show_short_version=False):
     """
     turns a datetime into an age string.
     If show_short_version is True, then it will generate a not so accurate but shorter string,
     example: 2days ago, instead of 2 days and 23 hours ago.
     :param prevdate: datetime object
     :param show_short_version: if it should aproximate the date and return a shorter string
     :rtype: unicode
     :returns: unicode words describing age
     """
     now = datetime.datetime.now()
     now = now.replace(microsecond=0)
     order = ['year', 'month', 'day', 'hour', 'minute', 'second']
     deltas = {}
     future = False
     if prevdate > now:
         now, prevdate = prevdate, now
         future = True
     # Get date parts deltas
     for part in order:
         if future:
             from dateutil import relativedelta
             d = relativedelta.relativedelta(now, prevdate)
             deltas[part] = getattr(d, part + 's')
         else:
             deltas[part] = getattr(now, part) - getattr(prevdate, part)
     # Fix negative offsets (there is 1 second between 10:59:59 and 11:00:00,
     # not 1 hour, -59 minutes and -59 seconds)
     for num, length in [(5, 60), (4, 60), (3, 24)]:  # seconds, minutes, hours
         part = order[num]
         carry_part = order[num - 1]
         if deltas[part] < 0:
             deltas[part] += length
             deltas[carry_part] -= 1
     # Same thing for days except that the increment depends on the (variable)
     # number of days in the month
     month_lengths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
     if deltas['day'] < 0:
         if prevdate.month == 2 and (prevdate.year % 4 == 0 and
             (prevdate.year % 100 != 0 or prevdate.year % 400 == 0)):
             deltas['day'] += 29
         else:
             deltas['day'] += month_lengths[prevdate.month - 1]
         deltas['month'] -= 1
     if deltas['month'] < 0:
         deltas['month'] += 12
         deltas['year'] -= 1
     # Format the result
     fmt_funcs = {
         'year': lambda d: ungettext(u'%d year', '%d years', d) % d,
         'month': lambda d: ungettext(u'%d month', '%d months', d) % d,
         'day': lambda d: ungettext(u'%d day', '%d days', d) % d,
         'hour': lambda d: ungettext(u'%d hour', '%d hours', d) % d,
         'minute': lambda d: ungettext(u'%d minute', '%d minutes', d) % d,
         'second': lambda d: ungettext(u'%d second', '%d seconds', d) % d,
+    }
     for i, part in enumerate(order):
         value = deltas[part]
         if value == 0:
             continue
         if i < 5:
             sub_part = order[i + 1]
             sub_value = deltas[sub_part]
         else:
             sub_value = 0
         if sub_value == 0:
+        if sub_value == 0 or show_short_version:
             if future:
                 return _(u'in %s') % fmt_funcs[part](value)
             else:
                 return _(u'%s ago') % fmt_funcs[part](value)
         if future:
             return _(u'in %s and %s') % (fmt_funcs[part](value),
                 fmt_funcs[sub_part](sub_value))
         else:
             return _(u'%s and %s ago') % (fmt_funcs[part](value),
                 fmt_funcs[sub_part](sub_value))
     return _(u'just now')
 def uri_filter(uri):
     """
     Removes user:password from given url string
     :param uri:
     :rtype: unicode
     :returns: filtered list of strings
     """
     if not uri:
         return ''
     proto = ''
     for pat in ('https://', 'http://'):
         if uri.startswith(pat):
             uri = uri[len(pat):]
             proto = pat
             break
     # remove passwords and username
     uri = uri[uri.find('@') + 1:]
     # get the port
     cred_pos = uri.find(':')
     if cred_pos == -1:
         host, port = uri, None
     else:
         host, port = uri[:cred_pos], uri[cred_pos + 1:]
     return filter(None, [proto, host, port])
 def credentials_filter(uri):
     """
     Returns a url with removed credentials
     :param uri:
     """
     uri = uri_filter(uri)
     #check if we have port
     if len(uri) > 2 and uri[2]:
         uri[2] = ':' + uri[2]
     return ''.join(uri)
 def get_changeset_safe(repo, rev):
     """
     Safe version of get_changeset if this changeset doesn't exists for a
     repo it returns a Dummy one instead
     :param repo:
     :param rev:
     """
     from rhodecode.lib.vcs.backends.base import BaseRepository
     from rhodecode.lib.vcs.exceptions import RepositoryError
     from rhodecode.lib.vcs.backends.base import EmptyChangeset
     if not isinstance(repo, BaseRepository):
         raise Exception('You must pass an Repository '
                         'object as first argument got %s', type(repo))
     try:
         cs = repo.get_changeset(rev)
     except RepositoryError:
         cs = EmptyChangeset(requested_revision=rev)
     return cs
 def datetime_to_time(dt):
     if dt:
         return time.mktime(dt.timetuple())
 def time_to_datetime(tm):
     if tm:
         if isinstance(tm, basestring):
             try:
                 tm = float(tm)
             except ValueError:
                 return
         return datetime.datetime.fromtimestamp(tm)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -1751,200 +1751,204 @@ div.form div.fields div.field div.button @@
     text-align: right;
     margin: 10px 0 0;
     padding: 0;
+}
 #content div.box div.pagination-right {
     float: right;
+}
 #content div.box div.pagination-wh a,
 #content div.box div.pagination-wh span.pager_dotdot,
 #content div.box div.pagination-wh span.yui-pg-previous,
 #content div.box div.pagination-wh span.yui-pg-last,
 #content div.box div.pagination-wh span.yui-pg-next,
 #content div.box div.pagination-wh span.yui-pg-first {
     height: 1%;
     float: left;
     background: #ebebeb url("../images/pager.png") repeat-x;
     border-top: 1px solid #dedede;
     border-left: 1px solid #cfcfcf;
     border-right: 1px solid #c4c4c4;
     border-bottom: 1px solid #c4c4c4;
     color: #4A4A4A;
     font-weight: 700;
     margin: 0 0 0 4px;
     padding: 6px;
+}
 #content div.box div.pagination-wh span.pager_curpage {
     height: 1%;
     float: left;
     background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
     border-right: 1px solid #b1b1b1;
     border-bottom: 1px solid #afafaf;
     color: #515151;
     font-weight: 700;
     margin: 0 0 0 4px;
     padding: 6px;
+}
 #content div.box div.pagination-wh a:hover, #content div.box div.pagination-wh a:active {
     background: #b4b4b4 url("../images/pager_selected.png") repeat-x;
     border-top: 1px solid #ccc;
     border-left: 1px solid #bebebe;
     border-right: 1px solid #b1b1b1;
     border-bottom: 1px solid #afafaf;
     text-decoration: none;
+}
 #content div.box div.traffic div.legend {
     clear: both;
     overflow: hidden;
     border-bottom: 1px solid #ddd;
     margin: 0 0 10px;
     padding: 0 0 10px;
+}
 #content div.box div.traffic div.legend h6 {
     float: left;
     border: none;
     margin: 0;
     padding: 0;
+}
 #content div.box div.traffic div.legend li {
     list-style: none;
     float: left;
     font-size: 11px;
     margin: 0;
     padding: 0 8px 0 4px;
+}
 #content div.box div.traffic div.legend li.visits {
     border-left: 12px solid #edc240;
+}
 #content div.box div.traffic div.legend li.pageviews {
     border-left: 12px solid #afd8f8;
+}
 #content div.box div.traffic table {
     width: auto;
+}
 #content div.box div.traffic table td {
     background: transparent;
     border: none;
     padding: 2px 3px 3px;
+}
 #content div.box div.traffic table td.legendLabel {
     padding: 0 3px 2px;
+}
 #summary {
     float: left;
     width: 80%;
 #content div.box #summary {
     /*float: left;*/
     /*width: 80%;*/
     margin-right: 200px;
+}
 #summary-menu-stats{
     float: left;
     width: 20%;
     width: 200px;
     position: absolute;
     top: 0;
     right: 0;
+}
 #summary-menu-stats ul {
     margin: 0 10px;
     display: block;
     background-color: #f9f9f9;
     border: 1px solid #d1d1d1;
     border-radius: 4px;
+}
 #content #summary-menu-stats li {
     border-top: 1px solid #d1d1d1;
     line-height: 32px;
     padding: 0;
+}
 #content #summary-menu-stats li:hover {
     background: #f0f0f0;
+}
 #content #summary-menu-stats li:first-child {
     border-top: none;
+}
 #summary-menu-stats a.followers         { background-image: url('../images/icons/heart.png')}
 #summary-menu-stats a.forks             { background-image: url('../images/icons/arrow_divide.png')}
 #summary-menu-stats a.settings          { background-image: url('../images/icons/cog_edit.png')}
 #summary-menu-stats a.feed              { background-image: url('../images/icons/rss_16.png')}
 #summary-menu-stats a.repo-size         { background-image: url('../images/icons/server.png')}
 #summary-menu-stats a {
     display: block;
     color: #000000;
     padding: 0 30px;
     background-repeat: no-repeat;
     background-position: 10px 50%;
+}
 #repo_size_2 {
     margin-left: 25px;
+}
 #summary-menu-stats a:hover {
     text-decoration: none;
+}
 #summary-menu-stats a span{
     background-color: #FFF;
     border: 1px inset #f0f0f0;
     border-radius:7px;
     padding: 1px;
     font-size: 10px;
+}
 #summary .metatag {
     display: inline-block;
     padding: 3px 5px;
     margin-bottom: 3px;
     margin-right: 1px;
     border-radius: 5px;
+}
 #content div.box #summary p {
     margin-bottom: -5px;
     width: 600px;
     white-space: pre-wrap;
+}
 #content div.box #summary p:last-child {
     margin-bottom: 9px;
+}
 #content div.box #summary p:first-of-type {
     margin-top: 9px;
+}
 .metatag {
     display: inline-block;
     margin-right: 1px;
     -webkit-border-radius: 4px 4px 4px 4px;
     -khtml-border-radius: 4px 4px 4px 4px;
     border-radius: 4px 4px 4px 4px;
     border: solid 1px #9CF;
     padding: 2px 3px 2px 3px !important;
     background-color: #DEF;
+}
 .metatag[tag="dead"] {
     background-color: #E44;
+}
 .metatag[tag="stale"] {
     background-color: #EA4;
+}
@@ @@ -2428,524 +2432,625 @@ a.metatag[tag="license"]:hover { @@
 .trending_language {
     background-color: #003367;
     color: #FFF;
     display: block;
     min-width: 20px;
     text-decoration: none;
     height: 12px;
     margin-bottom: 0px;
     margin-left: 5px;
     white-space: pre;
     padding: 3px;
+}
 h3.files_location {
     font-size: 1.8em;
     font-weight: 700;
     border-bottom: none !important;
     margin: 10px 0 !important;
+}
 #files_data dl dt {
     float: left;
     width: 60px;
     margin: 0 !important;
     padding: 5px;
+}
 #files_data dl dd {
     margin: 0 !important;
     padding: 5px !important;
+}
 .file_history {
     padding-top:10px;
     font-size:16px;
+}
 .file_author {
     float: left;
+}
 .file_author .item {
     float:left;
     padding:5px;
     color: #888;
+}
 .tablerow0 {
     background-color: #F8F8F8;
+}
 .tablerow1 {
     background-color: #FFFFFF;
+}
 .changeset_id {
     font-family: monospace;
     color: #666666;
+}
 .changeset_hash {
     color: #000000;
+}
 #changeset_content {
     border-left: 1px solid #CCC;
     border-right: 1px solid #CCC;
     border-bottom: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_compare_view_content {
     border: 1px solid #CCC;
     padding: 5px;
+}
 #changeset_content .container {
     min-height: 100px;
     font-size: 1.2em;
     overflow: hidden;
+}
 #changeset_compare_view_content .compare_view_commits {
     width: auto !important;
+}
 #changeset_compare_view_content .compare_view_commits td {
     padding: 0px 0px 0px 12px !important;
+}
 #changeset_content .container .right {
     float: right;
     width: 20%;
     text-align: right;
+}
-#changeset_content .container .left .message {
 #changeset_content .container .message {
     white-space: pre-wrap;
+}
-#changeset_content .container .left .message a:hover {
 #changeset_content .container .message a:hover {
     text-decoration: none;
+}
 .cs_files .cur_cs {
     margin: 10px 2px;
     font-weight: bold;
+}
 .cs_files .node {
     float: left;
+}
 .cs_files .changes {
     float: right;
     color:#003367;
+}
 .cs_files .changes .added {
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .changes .deleted {
     background-color: #FF8888;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*new binary*/
 .cs_files .changes .bin1 {
     background-color: #BBFFBB;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*deleted binary*/
 .cs_files .changes .bin2 {
     background-color: #FF8888;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*mod binary*/
 .cs_files .changes .bin3 {
     background-color: #DDDDDD;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 /*rename file*/
 .cs_files .changes .bin4 {
     background-color: #6D99FF;
     float: left;
     text-align: center;
     font-size: 9px;
     padding: 2px 0px 2px 0px;
+}
 .cs_files .cs_added, .cs_files .cs_A {
     background: url("../images/icons/page_white_add.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_changed, .cs_files .cs_M {
     background: url("../images/icons/page_white_edit.png") no-repeat scroll
 px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .cs_files .cs_removed, .cs_files .cs_D {
     background: url("../images/icons/page_white_delete.png") no-repeat
         scroll 3px;
     height: 16px;
     padding-left: 20px;
     margin-top: 7px;
     text-align: left;
+}
 .table {
     position: relative;
+}
 #graph {
     position: relative;
     overflow: hidden;
+}
 #graph_nodes {
     float: left;
     margin-right: 0px;
     margin-top: 0px;
     position: absolute;
+}
 #graph_content,
 #graph .info_box,
 #graph .container_header {
     margin-left: 100px;
+}
 #graph_content {
     width: 80%;
     float: left;
+}
 #graph_content .container_header {
     border-bottom: 1px solid #DDD;
     position: relative;
+}
 #graph .container_header {
     padding: 10px;
     height: 25px;
+}
 #graph_content #rev_range_container {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #rev_range_clear {
     float: left;
     margin: 0px 0px 0px 3px;
+}
 #graph_content #changesets {
     table-layout: fixed;
     border-collapse: collapse;
     border-left: none;
     border-right: none;
     border-color: #cdcdcd;
+}
 #graph_content .container {
     border-bottom: 1px solid #DDD;
     height: 56px;
     min-height: 5em;
+}
 #graph_content #changesets td {
     overflow: hidden;
     text-overflow:ellipsis;
     white-space: nowrap;
     height: 31px;
     border-color: #cdcdcd;
+}
 #graph_content .container .author {
    width: 105px;
+}
 #graph_content .container .hash{
     width: 90px;
     font-size: 0.85em;
+}
 #graph_content #changesets .container .date{
     width: 76px;
     color: #666;
     font-size: 10px;
+}
 #graph_content .container .right {
     float: right;
     width: 23%;
     text-align: right;
+}
 #graph_content .container .left {
     float: left;
     width: 25%;
     padding-left: 5px;
+}
     width: 120px;
     padding-right: 0px;
+}
 /*
 #graph_content .container .column3 {
     width: 12%
+}
 */
 #graph_content .container .mid {
     position: relative;
+}
 #graph_content #changesets td.checkbox{
     width: 20px;
+}
 #graph_content .container .changeset_range {
     float: left;
     width: 49%;
+}
 #graph_content .container .left .date {
     color: #666;
     padding-left: 22px;
     font-size: 10px;
+}
 #graph_content .container .left .author {
     height: 22px;
+}
 #graph_content .container .left .author .user {
     margin: 6px 3px;
+}
 #graph_content .container .author img {
     vertical-align: middle;
+}
 #graph_content .container .author .user {
     color: #444444;
     float: left;
     margin-left: -4px;
     margin-top: 4px;
+}
 #graph_content .container .mid .message {
     white-space: pre-wrap;
     padding: 0;
     overflow: hidden;
     height: 1.1em;
+}
 #graph_content .container .mid .logtags {
     display: block;
     position: absolute;
     top: 0;
     right: 0;
     padding: 0 5px;
     background: #FFFFFF;
+}
 #graph_content .right .comments-container,
 #graph_content .right .logtags {
     display: block;
     float: left;
     overflow: hidden;
     width: 50%;
     padding: 0;
     margin: 0;
+}
 #graph_content .right .comments-container{
     width: 40px;
+}
 #graph_content .right .logtags {
     width: 80px;
     height: 2.5em;
     position: absolute;
     left: 40px;
+}
 #graph_content .right .logtags:hover {
     position: absolute;
     width: auto;
+}
 #graph_content .right .logtags .bookbook,
 #graph_content .right .logtags .tagtag {
     float: left;
     line-height: 1em;
     margin-bottom: 1px;
+}
 #graph_content .container .mid .message a:hover {
     text-decoration: none;
+}
 /*
  * Stuff we might want to remove from the changelog, or reposition in a tooltip
  */
 #graph_content .container .changeset_id,
 #graph_content .container .changes,
 #graph_content .container .changed_total,
 #graph_content .container .parent {
     display: none;
+}
 .revision-link {
     color:#3F6F9F;
     font-weight: bold !important;
+}
 .issue-tracker-link {
     color:#3F6F9F;
     font-weight: bold !important;
+}
 .changeset-status-container {
     padding-right: 5px;
     margin-top:1px;
     float:right;
     height:14px;
+}
 .code-header .changeset-status-container {
     float:left;
     padding:2px 0px 0px 2px;
+}
 .changeset-status-container .changeset-status-lbl {
     color: rgb(136, 136, 136);
     float: left;
     padding: 3px 4px 0px 0px
+}
 .code-header .changeset-status-container .changeset-status-lbl {
     float: left;
     padding: 0px 4px 0px 0px;
+}
 .changeset-status-container .changeset-status-ico {
     float: left;
+}
 .code-header .changeset-status-container .changeset-status-ico, .container .changeset-status-ico {
     float: left;
+}
 .right .comments-container {
     padding-right: 5px;
     margin-top:1px;
     float:right;
     height:14px;
+}
 .right .comments-cnt {
     float: left;
     color: rgb(136, 136, 136);
     padding-right: 2px;
     padding: 5px 0;
+}
 .right .comments-cnt a {
     background-image: url('../images/icons/comments.png');
     background-repeat: no-repeat;
     background-position: 100% 50%;
     padding: 5px 0;
     padding-right: 20px;
+}
 .right .changes {
     clear: both;
+}
 .right .changes .changed_total {
     display: block;
     float: right;
     text-align: center;
     min-width: 45px;
     cursor: pointer;
     color: #444444;
     background: #FEA;
     -webkit-border-radius: 0px 0px 0px 6px;
     border-radius: 0px 0px 0px 6px;
     padding: 1px;
+}
 .right .changes .added, .changed, .removed {
     display: block;
     padding: 1px;
     color: #444444;
     float: right;
     text-align: center;
     min-width: 15px;
+}
 .right .changes .added {
     background: #CFC;
+}
 .right .changes .changed {
     background: #FEA;
+}
 .right .changes .removed {
     background: #FAA;
+}
 .right .merge {
     padding: 1px 3px 1px 3px;
     background-color: #fca062;
     font-size: 10px;
     font-weight: bold;
     color: #ffffff;
     text-transform: uppercase;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
     margin-right: 2px;
+}
 .right .parent {
     color: #666666;
     clear:both;
+}
 .right .logtags {
     padding: 2px 2px 2px 2px;
     /*padding: 2px 2px 2px 2px;*/
     line-height: 2.2em;
+}
 .right .logtags .branchtag, .right .logtags .tagtag, .right .logtags .booktag {
     margin: 0px 2px;
+}
 .right .logtags .branchtag,
 .logtags .branchtag,
 .spantag {
     padding: 1px 3px 1px 3px;
     background-color: #bfbfbf;
     font-size: 10px;
     font-weight: bold;
     color: #ffffff;
     color: #336699;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
     -webkit-border-radius: 4px;
     border-radius: 4px;
     border: 1px solid #d9e8f8;
     line-height: 1.5em;
     margin: 1.1em 0;
+}
 .right .logtags .branchtag,
 .logtags .tagtag,
 .right .merge {
     float: right;
     /*height: 1em;*/
     line-height: 1em;
     /*padding: 0px 0px !important;*/
     margin: 1px 1px !important;
     display: block;
+}
 .right .logtags .branchtag a:hover, .logtags .branchtag a {
     color: #ffffff;
+}
 .right .logtags .branchtag a:hover, .logtags .branchtag a:hover {
     text-decoration: none;
-    color: #ffffff;
+    color: #336699;
+}
 .right .logtags .tagtag, .logtags .tagtag {
     padding: 1px 3px 1px 3px;
     background-color: #62cffc;
     font-size: 10px;
     font-weight: bold;
     color: #ffffff;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
 .right .logtags .tagtag a:hover, .logtags .tagtag a {
     color: #ffffff;
+}
 .right .logtags .tagtag a:hover, .logtags .tagtag a:hover {
     text-decoration: none;
     color: #ffffff;
+}
 .right .logbooks .bookbook, .logbooks .bookbook, .right .logtags .bookbook, .logtags .bookbook {
     padding: 1px 3px 1px 3px;
     background-color: #46A546;
     font-size: 10px;
     font-weight: bold;
     color: #ffffff;
     text-transform: uppercase;
     white-space: nowrap;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+}
 .right .logbooks .bookbook, .logbooks .bookbook a, .right .logtags .bookbook, .logtags .bookbook a {
     color: #ffffff;
+}
 .right .logbooks .bookbook, .logbooks .bookbook a:hover, .right .logtags .bookbook, .logtags .bookbook a:hover {
     text-decoration: none;
     color: #ffffff;
+}
 div.browserblock {
     overflow: hidden;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 125%;
     padding: 0;
     -webkit-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.browserblock .browser-header {
     background: #FFF;
     padding: 10px 0px 15px 0px;
     width: 100%;
+}
 div.browserblock .browser-nav {
     float: left
+}
 div.browserblock .browser-branch {
     float: left;
+}
 div.browserblock .browser-branch label {
     color: #4A4A4A;
     vertical-align: text-top;
+}
 div.browserblock .browser-header span {
     margin-left: 5px;
     font-weight: 700;
+}
 div.browserblock .browser-search {
     clear: both;
     padding: 8px 8px 0px 5px;
     height: 20px;
+}
 div.browserblock #node_filter_box {
+}
 div.browserblock .search_activate {
     float: left
+}
 div.browserblock .add_node {
     float: left;
     padding-left: 5px;
+}
 div.browserblock .search_activate a:hover, div.browserblock .add_node a:hover {
     text-decoration: none !important;
+}
 div.browserblock .browser-body {
     background: #EEE;
     border-top: 1px solid #CCC;
+}
 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;
+}
@@ @@ -3635,192 +3740,193 @@ div.gravatar img { @@
     background-color: #339bb9;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));
     background-image: -moz-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -ms-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));
     background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9);
     background-image: -o-linear-gradient(top, #5bc0de, #339bb9);
     background-image: linear-gradient(to bottom, #5bc0de, #339bb9);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);
     border-color: #339bb9 #339bb9 #22697d;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .ui-btn.green {
     background-color: #57a957;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));
     background-image: -moz-linear-gradient(top, #62c462, #57a957);
     background-image: -ms-linear-gradient(top, #62c462, #57a957);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));
     background-image: -webkit-linear-gradient(top, #62c462, #57a957);
     background-image: -o-linear-gradient(top, #62c462, #57a957);
     background-image: linear-gradient(to bottom, #62c462, #57a957);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);
     border-color: #57a957 #57a957 #3d773d;
     border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+}
 .ui-btn.blue.hidden {
     display: none;
+}
 .ui-btn.active {
     font-weight: bold;
+}
 ins, div.options a:hover {
     text-decoration: none;
+}
 img,
 #header #header-inner #quick li a:hover span.normal,
 #header #header-inner #quick li ul li.last,
 #content div.box div.form div.fields div.field div.textarea table td table td a,
 #clone_url,
 #clone_url_id
+{
     border: none;
+}
 img.icon, .right .merge img {
     vertical-align: bottom;
+}
 #header ul#logged-user, #content div.box div.title ul.links,
 #content div.box div.message div.dismiss,
 #content div.box div.traffic div.legend ul {
     float: right;
     margin: 0;
     padding: 0;
+}
 #header #header-inner #home, #header #header-inner #logo,
 #content div.box ul.left, #content div.box ol.left,
 #content div.box div.pagination-left, div#commit_history,
 div#legend_data, div#legend_container, div#legend_choices {
     float: left;
+}
 #header #header-inner #quick li #quick_login,
 #header #header-inner #quick li:hover ul ul,
 #header #header-inner #quick li:hover ul ul ul,
 #header #header-inner #quick li:hover ul ul ul ul,
 #content #left #menu ul.closed, #content #left #menu li ul.collapsed, .yui-tt-shadow {
     display: none;
+}
 #header #header-inner #quick li:hover #quick_login,
 #header #header-inner #quick li:hover ul, #header #header-inner #quick li li:hover ul, #header #header-inner #quick li li li:hover ul, #header #header-inner #quick li li li li:hover ul, #content #left #menu ul.opened, #content #left #menu li ul.expanded {
     display: block;
+}
 #content div.graph {
     padding: 0 10px 10px;
+}
 #content div.box div.title ul.links li a:hover, #content div.box div.title ul.links li.ui-tabs-selected a {
     color: #bfe3ff;
+}
 #content div.box ol.lower-roman, #content div.box ol.upper-roman, #content div.box ol.lower-alpha, #content div.box ol.upper-alpha, #content div.box ol.decimal {
     margin: 10px 24px 10px 44px;
+}
 #content div.box div.form, #content div.box div.table, #content div.box div.traffic {
     position: relative;
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 20px 10px;
+}
 #content div.box div.form div.fields, #login div.form, #login div.form div.fields, #register div.form, #register div.form div.fields {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0;
+}
 #content div.box div.form div.fields div.field div.label span, #login div.form div.fields div.field div.label span, #register div.form div.fields div.field div.label span {
     height: 1%;
     display: block;
     color: #363636;
     margin: 0;
     padding: 2px 0 0;
+}
 #content div.box div.form div.fields div.field div.input input.error, #login div.form div.fields div.field div.input input.error, #register div.form div.fields div.field div.input input.error {
     background: #FBE3E4;
     border-top: 1px solid #e1b2b3;
     border-left: 1px solid #e1b2b3;
     border-right: 1px solid #FBC2C4;
     border-bottom: 1px solid #FBC2C4;
+}
 #content div.box div.form div.fields div.field div.input input.success, #login div.form div.fields div.field div.input input.success, #register div.form div.fields div.field div.input input.success {
     background: #E6EFC2;
     border-top: 1px solid #cebb98;
     border-left: 1px solid #cebb98;
     border-right: 1px solid #c6d880;
     border-bottom: 1px solid #c6d880;
+}
 #content div.box-left div.form div.fields div.field div.textarea, #content div.box-right div.form div.fields div.field div.textarea, #content div.box div.form div.fields div.field div.select select, #content div.box table th.selected input, #content div.box table td.selected input {
     margin: 0;
+}
 #content div.box-left div.form div.fields div.field div.select, #content div.box-left div.form div.fields div.field div.checkboxes, #content div.box-left div.form div.fields div.field div.radios, #content div.box-right div.form div.fields div.field div.select, #content div.box-right div.form div.fields div.field div.checkboxes, #content div.box-right div.form div.fields div.field div.radios {
     margin: 0 0 0 0px !important;
     padding: 0;
+}
 #content div.box div.form div.fields div.field div.select, #content div.box div.form div.fields div.field div.checkboxes, #content div.box div.form div.fields div.field div.radios {
     margin: 0 0 0 200px;
     padding: 0;
+}
 #content div.box div.form div.fields div.field div.select a:hover, #content div.box div.form div.fields div.field div.select a.ui-selectmenu:hover, #content div.box div.action a:hover {
     color: #000;
     text-decoration: none;
+}
 #content div.box div.form div.fields div.field div.select a.ui-selectmenu-focus, #content div.box div.action a.ui-selectmenu-focus {
     border: 1px solid #666;
+}
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox, #content div.box div.form div.fields div.field div.radios div.radio {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 8px 0 2px;
+}
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox input, #content div.box div.form div.fields div.field div.radios div.radio input {
     float: left;
     margin: 0;
+}
 #content div.box div.form div.fields div.field div.checkboxes div.checkbox label, #content div.box div.form div.fields div.field div.radios div.radio label {
     height: 1%;
     display: block;
     float: left;
     margin: 2px 0 0 4px;
+}
 div.form div.fields div.field div.button input,
 #content div.box div.form div.fields div.buttons input
 div.form div.fields div.buttons input,
 #content div.box div.action div.button input {
     /*color: #000;*/
     font-size: 11px;
     font-weight: 700;
     margin: 0;
+}
 input.ui-button {
     background: #e5e3e3 url("../images/button.png") repeat-x;
     border-top: 1px solid #DDD;
     border-left: 1px solid #c6c6c6;
     border-right: 1px solid #DDD;
     border-bottom: 1px solid #c6c6c6;
     color: #515151 !important;
@@ @@ -3892,199 +3998,193 @@ div.form div.fields div.field div.highli @@
     border-top: 1px solid #dedede;
     border-left: 1px solid #cfcfcf;
     border-right: 1px solid #c4c4c4;
     border-bottom: 1px solid #c4c4c4;
     color: #4A4A4A;
     font-weight: 700;
     margin: 0;
     padding: 6px 8px;
+}
 #content div.box div.pagination ul.pager li.disabled, #content div.box div.pagination-wh a.disabled {
     color: #B4B4B4;
     padding: 6px;
+}
 #login, #register {
     width: 520px;
     margin: 10% auto 0;
     padding: 0;
+}
 #login div.color, #register div.color {
     clear: both;
     overflow: hidden;
     background: #FFF;
     margin: 10px auto 0;
     padding: 3px 3px 3px 0;
+}
 #login div.color a, #register div.color a {
     width: 20px;
     height: 20px;
     display: block;
     float: left;
     margin: 0 0 0 3px;
     padding: 0;
+}
 #login div.title h5, #register div.title h5 {
     color: #fff;
     margin: 10px;
     padding: 0;
+}
 #login div.form div.fields div.field, #register div.form div.fields div.field {
     clear: both;
     overflow: hidden;
     margin: 0;
     padding: 0 0 10px;
+}
 #login div.form div.fields div.field span.error-message, #register div.form div.fields div.field span.error-message {
     height: 1%;
     display: block;
     color: red;
     margin: 8px 0 0;
     padding: 0;
     max-width: 320px;
+}
 #login div.form div.fields div.field div.label label, #register div.form div.fields div.field div.label label {
     color: #000;
     font-weight: 700;
+}
 #login div.form div.fields div.field div.input, #register div.form div.fields div.field div.input {
     float: left;
     margin: 0;
     padding: 0;
+}
 #login div.form div.fields div.field div.input input.large {
     width: 250px;
+}
 #login div.form div.fields div.field div.checkbox, #register div.form div.fields div.field div.checkbox {
     margin: 0 0 0 184px;
     padding: 0;
+}
 #login div.form div.fields div.field div.checkbox label, #register div.form div.fields div.field div.checkbox label {
     color: #565656;
     font-weight: 700;
+}
 #login div.form div.fields div.buttons input, #register div.form div.fields div.buttons input {
     color: #000;
     font-size: 1em;
     font-weight: 700;
     margin: 0;
+}
 #changeset_content .container .wrapper, #graph_content .container .wrapper {
     width: 600px;
+}
 #changeset_content .container .left {
     float: left;
     width: 75%;
     padding-left: 5px;
+}
 #changeset_content .container .left .date, .ac .match {
 #changeset_content .container .date, .ac .match {
     font-weight: 700;
     padding-top: 5px;
     padding-bottom: 5px;
+}
 div#legend_container table td, div#legend_choices table td {
     border: none !important;
     height: 20px !important;
     padding: 0 !important;
+}
 .q_filter_box {
     -webkit-box-shadow: rgba(0,0,0,0.07) 0 1px 2px inset;
     -webkit-border-radius: 4px;
     border-radius: 4px;
     border: 0 none;
     color: #AAAAAA;
     margin-bottom: -4px;
     margin-top: -4px;
     padding-left: 3px;
+}
 #node_filter {
     border: 0px solid #545454;
     color: #AAAAAA;
     padding-left: 3px;
+}
 .group_members_wrap {
     min-height: 85px;
     padding-left: 20px;
+}
 .group_members .group_member {
     height: 30px;
     padding:0px 0px 0px 0px;
+}
 .reviewers_member {
     height: 15px;
     padding:0px 0px 0px 10px;
+}
 .emails_wrap {
     padding: 0px 20px;
+}
 .emails_wrap .email_entry {
     height: 30px;
     padding:0px 0px 0px 10px;
+}
 .emails_wrap .email_entry .email {
     float: left
+}
 .emails_wrap .email_entry .email_action {
     float: left
+}
 .ips_wrap {
     padding: 0px 20px;
+}
 .ips_wrap .ip_entry {
     height: 30px;
     padding:0px 0px 0px 10px;
+}
 .ips_wrap .ip_entry .ip {
     float: left
+}
 .ips_wrap .ip_entry .ip_action {
     float: left
+}
 /*README STYLE*/
 div.readme {
     padding:0px;
+}
 div.readme h2 {
     font-weight: normal;
+}
 div.readme .readme_box {
     background-color: #fafafa;
+}
 div.readme .readme_box {
     clear:both;
     overflow:hidden;
     margin:0;
     padding:0 20px 10px;
+}

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
 ${_('%s Changelog') % c.repo_name} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     <% size = c.size if c.size <= c.total_cs else c.total_cs %>
     ${_('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()">
  ${self.context_bar('changelog')}
 <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="info_box" style="clear: both;padding: 10px 6px;text-align: right;">
                     <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
                     <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>
                     %if c.rhodecode_db_repo.fork:
                         <a title="${_('Compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default')}" class="ui-btn small">${_('Compare fork with parent')}</a>
                     %endif
                     %if h.is_hg(c.rhodecode_repo):
                     <a id="open_new_pr" href="${h.url('pullrequest_form',repo_name=c.repo_name)}" class="ui-btn small">${_('Open new pull request')}</a>
                     %endif
                     </div>
                     <div class="container_header">
                         ${h.form(h.url.current(),method='get')}
-                        <div class="info_box" style="float:left">
                     <div style="float:left">
                           ${h.submit('set',_('Show'),class_="ui-btn")}
                           ${h.text('size',size=1,value=c.size)}
                           ${_('revisions')}
                         </div>
                         ${h.end_form()}
                     <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.raw_id,class_="changeset_range")}
                             <span class="tooltip" title="${h.tooltip(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 id="graph_nodes">
                     <canvas id="graph_canvas"></canvas>
                             </div>
                             <div class="author">
                                 <div class="gravatar">
                 <div id="graph_content">
                 <table id="changesets">
                 <tbody>
                 %for cnt,cs in enumerate(c.pagination):
                     <tr id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
                         <td class="checkbox">
                             ${h.checkbox(cs.raw_id,class_="changeset_range")}
                         </td>
                         <td class="author">
                                     <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(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">
                             <span title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</span>
                         </td>
                         <td class="hash">
                             <span class="tooltip" title="${h.tooltip(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>
                                     <span class="changeset_hash">${h.short_id(cs.raw_id)}</span>
                                 </a>
                             </span>
                         </td>
                         <td class="date">
                             <div class="date">${h.age(cs.date,True)}</div>
                         </td>
                         <td class="mid">
                             <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>
                             %if cs.branch:
                                 <div class="logtags">
                                     <div 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))}
                         </div>
                         <div class="right">
                                     <div class="changes">
                                         <div id="changed_total_${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${h.tooltip(_('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
                         </td>
                         <td class="right">
                             <div class="changes">
                                 <div id="changed_total_${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${h.tooltip(_('Affected number of files, click to show more details'))}">
                                     ${len(cs.affected_files)}
                                         </div>
                                         <div class="changeset-status-container">
                                             %if c.statuses.get(cs.raw_id):
                                               <div title="${_('Changeset status')}" class="changeset-status-lbl">${c.statuses.get(cs.raw_id)[1]}</div>
                                               <div class="changeset-status-ico">
                                               %if c.statuses.get(cs.raw_id)[2]:
                                                 <a class="tooltip" title="${_('Click to open associated pull request #%s' % c.statuses.get(cs.raw_id)[2])}" href="${h.url('pullrequest_show',repo_name=c.statuses.get(cs.raw_id)[3],pull_request_id=c.statuses.get(cs.raw_id)[2])}"><img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" /></a>
                                               %else:
                                                 <img src="${h.url('/images/icons/flag_status_%s.png' % c.statuses.get(cs.raw_id)[0])}" />
                                               %endif
                                               </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">
                             <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)}">
                                             ${len(c.comments[cs.raw_id])}
                                         </a>
                                     </div>
                                 %endif
                             </div>
                             <div 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
                                         ${h.link_to(h.shorter(tag),h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}
                                 </span>
                                 %endfor
                         </div>
                     </div>
                         </td>
                     </tr>
                 %endfor
                 </tbody>
                 </table>
                 <div class="pagination-wh pagination-left">
                     ${c.pagination.pager('$link_previous ~2~ $link_next')}
                 </div>
                 </div>
             </div>
             <script type="text/javascript" src="${h.url('/js/graph.js')}"></script>
             <script type="text/javascript">
                 YAHOO.util.Event.onDOMReady(function(){
                     //Monitor range checkboxes and build a link to changesets
                     //ranges
                     var checkboxes = YUD.getElementsByClassName('changeset_range');
                     var url_tmpl = "${h.url('changeset_home',repo_name=c.repo_name,revision='__REVRANGE__')}";
                     var pr_tmpl = "${h.url('pullrequest_home',repo_name=c.repo_name)}";
                     var checkbox_checker = function(e){
                         var clicked_cb = e.currentTarget;
                         var checked_checkboxes = [];
                         for (pos in checkboxes){
                             if(checkboxes[pos].checked){
                                 checked_checkboxes.push(checkboxes[pos]);
+                            }
+                        }
                         if(YUD.get('open_new_pr')){
                           if(checked_checkboxes.length>0){
                             // modify open pull request to show we have selected cs
                             YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
                           }else{
                             YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
+                          }
+                        }
                         if(checked_checkboxes.length>0){
                             var rev_end = checked_checkboxes[0].name;
                             var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                             var url = url_tmpl.replace('__REVRANGE__',
                                     rev_start+'...'+rev_end);
                             var link = (rev_start == rev_end)
                                 ? _TM['Show selected change __S']
                                 : _TM['Show selected changes __S -> __E'];
                             link = link.replace('__S',rev_start.substr(0,6));
                             link = link.replace('__E',rev_end.substr(0,6));
                             YUD.get('rev_range_container').href = url;
                             YUD.get('rev_range_container').innerHTML = link;
                             YUD.setStyle('rev_range_container','display','');
                             YUD.setStyle('rev_range_clear','display','');
                             YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end);
+                        }
                         else{
                     } else{
                             YUD.setStyle('rev_range_container','display','none');
                             YUD.setStyle('rev_range_clear','display','none');
+                        }
                     };
                     YUE.onDOMReady(checkbox_checker);
                     YUE.on(checkboxes,'click', checkbox_checker);
                     YUE.on('rev_range_clear','click',function(e){
                         for (var i=0; i<checkboxes.length; i++){
                             var cb = checkboxes[i];
                             cb.checked = false;
+                        }
                         YUE.preventDefault(e);
                     })
                 });
                     var msgs = YUQ('.message');
                     // get first element height
                     var el = YUQ('#graph_content .container')[0];
                     var row_h = el.clientHeight;
                     for(var i=0;i<msgs.length;i++){
                         var m = msgs[i];
                         var h = m.clientHeight;
                         var pad = YUD.getStyle(m,'padding');
                         if(h > row_h){
                             var offset = row_h - (h+12);
                             YUD.setStyle(m.nextElementSibling,'display','block');
                             YUD.setStyle(m.nextElementSibling,'margin-top',offset+'px');
                         };
+                    }
                     YUE.on(YUQ('.expand'),'click',function(e){
                         var elem = e.currentTarget.parentNode.parentNode;
                         YUD.setStyle(e.currentTarget,'display','none');
                         YUD.setStyle(elem,'height','auto');
                         //redraw the graph, line_count and jsdata are global vars
                         set_canvas(100);
                         var r = new BranchRenderer();
                         r.render(jsdata,100,line_count);
-                    })
+                });
                     // Fetch changeset details
                     YUE.on(YUD.getElementsByClassName('changed_total'),'click',function(e){
                         var id = e.currentTarget.id;
                         var url = "${h.url('changelog_details',repo_name=c.repo_name,cs='__CS__')}";
                         var url = url.replace('__CS__',id.replace('changed_total_',''));
                         ypjax(url,id,function(){tooltip_activate()});
                     });
                     // change branch filter
                     YUE.on(YUD.get('branch_filter'),'change',function(e){
                         var selected_branch = e.currentTarget.options[e.currentTarget.selectedIndex].value;
                         var url_main = "${h.url('changelog_home',repo_name=c.repo_name)}";
                         var url = "${h.url('changelog_home',repo_name=c.repo_name,branch='__BRANCH__')}";
                         var url = url.replace('__BRANCH__',selected_branch);
                         if(selected_branch != ''){
                             window.location = url;
                         }else{
                             window.location = url_main;
+                        }
                     });
                     function set_canvas(width) {
                         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';
+                    //c.style.height=div_h+'px';
                         canvas.setAttribute('height',div_h);
-                        c.style.height=width+'px';
+                    //c.style.height=width+'px';
                         canvas.setAttribute('width',width);
                     };
                     var heads = 1;
                     var line_count = 0;
                     var jsdata = ${c.jsdata|n};
                     for (var i=0;i<jsdata.length;i++) {
                         var in_l = jsdata[i][2];
                         for (var j in in_l) {
                             var m = in_l[j][1];
                             if (m > line_count)
                                 line_count = m;
+                        }
+                    }
                     set_canvas(100);
                     var r = new BranchRenderer();
                     r.render(jsdata,100,line_count);
                 });
             </script>
         %else:
             ${_('There are no changes yet')}
         %endif
     </div>
 </div>
 </%def>

0 comments (0 inline, 0 general)