kallithea Changeset - 37b3c3244bbc

Changeset - 37b3c3244bbc

Parent rev.

Child rev.

[Not reviewed]

beta

0 7 0

Marcin Kuzminski - 14 years ago 2012-01-09 02:46:56
marcin@python-works.com

UI fixes
- added expandable commits messages
- ui fixes, icons/graph

7 files changed with 95 insertions and 36 deletions:

development.ini

rhodecode/lib/helpers.py

rhodecode/public/css/style.css

rhodecode/public/js/graph.js

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changeset/changeset.html

rhodecode/templates/changeset/diff_block.html

0 comments (0 inline, 0 general)

development.ini

➞

Show inline comments

 ################################################################################
 ################################################################################
 # RhodeCode - Pylons environment configuration                                 #
 #                                                                              #
 # The %(here)s variable will be replaced with the parent directory of this file#
 ################################################################################
 [DEFAULT]
 debug = true
 pdebug = false
 ################################################################################
 ## Uncomment and replace with the address which should receive                ##
 ## any error reports after application crash                                  ##
 ## Additionally those settings will be used by RhodeCode mailing system       ##
 ################################################################################
 #email_to = admin@localhost
 #error_email_from = paste_error@localhost
 #app_email_from = rhodecode-noreply@localhost
 #error_message =
 #email_prefix = [RhodeCode]
 #smtp_server = mail.server.com
 #smtp_username =
 #smtp_password =
 #smtp_port =
 #smtp_use_tls = false
 #smtp_use_ssl = true
 # Specify available auth parameters here (e.g. LOGIN PLAIN CRAM-MD5, etc.)
 #smtp_auth =
 [server:main]
 ##nr of threads to spawn
 threadpool_workers = 5
 ##max request before thread respawn
 threadpool_max_requests = 10
 ##option to use threads of process
 use_threadpool = true
 use = egg:Paste#http
 host = 0.0.0.0
 port = 5000
 [app:main]
 use = egg:rhodecode
 full_stack = true
 static_files = true
 lang=en
 cache_dir = %(here)s/data
 index_dir = %(here)s/data/index
 app_instance_uuid = develop
 cut_off_limit = 256000
 force_https = false
 commit_parse_limit = 25
 use_gravatar = true
 container_auth_enabled = false
 proxypass_auth_enabled = false
 ## overwrite schema of clone url
 ## available vars:
 ## scheme - http/https
 ## user - current user
 ## pass - password
 ## netloc - network location
 ## path - usually repo_name
 #clone_uri = {scheme}://{user}{pass}{netloc}{path}
 ## issue tracking mapping for commits messages
 ## uncomment url_pat, issue_server, issue_prefix to enable
 ## pattern to get the issues from commit messages
 ## default one used here is #1234
-#url_pat = (?:^#|\s#)(\w+)
 url_pat = (?:^#|\s#)(\w+)
 ## server url to the issue, each {id} will be replaced with id
 ## fetched from the regex
-#issue_server = https://myissueserver.com/issue/{id}
 issue_server = https://myissueserver.com/issue/{id}
 ## prefix to add to link to indicate it's an url
 ## #314 will be replaced by <issue_prefix><id>
-#issue_prefix = #
 issue_prefix = #
 ####################################
 ###        CELERY CONFIG        ####
 ####################################
 use_celery = false
 broker.host = localhost
 broker.vhost = rabbitmqhost
 broker.port = 5672
 broker.user = rabbitmq
 broker.password = qweqwe
 celery.imports = rhodecode.lib.celerylib.tasks
 celery.result.backend = amqp
 celery.result.dburi = amqp://
 celery.result.serialier = json
 #celery.send.task.error.emails = true
 #celery.amqp.task.result.expires = 18000
 celeryd.concurrency = 2
 #celeryd.log.file = celeryd.log
 celeryd.log.level = debug
 celeryd.max.tasks.per.child = 1
 #tasks will never be sent to the queue, but executed locally instead.
 celery.always.eager = false
 ####################################
 ###         BEAKER CACHE        ####
 ####################################
 beaker.cache.data_dir=%(here)s/data/cache/data
 beaker.cache.lock_dir=%(here)s/data/cache/lock
 beaker.cache.regions=super_short_term,short_term,long_term,sql_cache_short,sql_cache_med,sql_cache_long
 beaker.cache.super_short_term.type=memory
 beaker.cache.super_short_term.expire=10
 beaker.cache.super_short_term.key_length = 256
 beaker.cache.short_term.type=memory
 beaker.cache.short_term.expire=60
 beaker.cache.short_term.key_length = 256
 beaker.cache.long_term.type=memory
 beaker.cache.long_term.expire=36000
 beaker.cache.long_term.key_length = 256
 beaker.cache.sql_cache_short.type=memory
 beaker.cache.sql_cache_short.expire=10
 beaker.cache.sql_cache_short.key_length = 256
 beaker.cache.sql_cache_med.type=memory
 beaker.cache.sql_cache_med.expire=360
 beaker.cache.sql_cache_med.key_length = 256
 beaker.cache.sql_cache_long.type=file
 beaker.cache.sql_cache_long.expire=3600
 beaker.cache.sql_cache_long.key_length = 256
 ####################################
 ###       BEAKER SESSION        ####
 ####################################
 ## Type of storage used for the session, current types are
 ## dbm, file, memcached, database, and memory.
 ## The storage uses the Container API
 ## that is also used by the cache system.
 ## db session example
 #beaker.session.type = ext:database
 #beaker.session.sa.url = postgresql://postgres:qwe@localhost/rhodecode
 #beaker.session.table_name = db_session
 ## encrypted cookie session, good for many instances
 #beaker.session.type = cookie
 beaker.session.type = file
 beaker.session.key = rhodecode
 #beaker.session.encrypt_key = g654dcno0-9873jhgfreyu
 #beaker.session.validate_key = 9712sds2212c--zxc123
 beaker.session.timeout = 36000
 beaker.session.httponly = true
 ## uncomment for https secure cookie
 beaker.session.secure = false
 ##auto save the session to not to use .save()
 beaker.session.auto = False
 ##true exire at browser close
 #beaker.session.cookie_expires = 3600
 ################################################################################
 ## WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*  ##
 ## Debug mode will enable the interactive debugging tool, allowing ANYONE to  ##
 ## execute malicious code after an exception is raised.                       ##
 ################################################################################
 #set debug = false
 ##################################
 ###       LOGVIEW CONFIG       ###
 ##################################
 logview.sqlalchemy = #faa
 logview.pylons.templating = #bfb
 logview.pylons.util = #eee
 #########################################################
 ### DB CONFIGS - EACH DB WILL HAVE IT'S OWN CONFIG    ###
 #########################################################
 #sqlalchemy.db1.url = sqlite:///%(here)s/rhodecode.db
 sqlalchemy.db1.url = postgresql://postgres:qwe@localhost/rhodecode
 sqlalchemy.db1.echo = false
 sqlalchemy.db1.pool_recycle = 3600
 sqlalchemy.convert_unicode = true
 ################################
 ### LOGGING CONFIGURATION   ####
 ################################
 [loggers]
 keys = root, routes, rhodecode, sqlalchemy, beaker, templates
 [handlers]
 keys = console, console_sql
 [formatters]
 keys = generic, color_formatter, color_formatter_sql
 #############
 ## LOGGERS ##
 #############
 [logger_root]
 level = NOTSET
 handlers = console
 [logger_routes]
 level = DEBUG
 handlers =
 qualname = routes.middleware
 # "level = DEBUG" logs the route matched and routing variables.
 propagate = 1
 [logger_beaker]
 level = DEBUG
 handlers =
 qualname = beaker.container
 propagate = 1
 [logger_templates]
 level = INFO
 handlers =
 qualname = pylons.templating
 propagate = 1
 [logger_rhodecode]
 level = DEBUG
 handlers =
 qualname = rhodecode
 propagate = 1
 [logger_sqlalchemy]
 level = INFO
 handlers = console_sql
 qualname = sqlalchemy.engine
 propagate = 0
 ##############
 ## HANDLERS ##
 ##############
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
 level = DEBUG
 formatter = color_formatter
 [handler_console_sql]
 class = StreamHandler
 args = (sys.stderr,)
 level = DEBUG
 formatter = color_formatter_sql
 ################
 ## FORMATTERS ##
 ################
 [formatter_generic]
 format = %(asctime)s.%(msecs)03d %(levelname)-5.5s [%(name)s] %(message)s
 datefmt = %Y-%m-%d %H:%M:%S

rhodecode/lib/helpers.py

➞

Show inline comments

@@ @@ -569,224 +569,224 @@ class RepoPage(Page): @@
         self.collection = collection
         # The self.page is the number of the current page.
         # The first page has the number 1!
         try:
             self.page = int(page) # make it int() if we get it as a string
         except (ValueError, TypeError):
             self.page = 1
         self.items_per_page = items_per_page
         # Unless the user tells us how many items the collections has
         # we calculate that ourselves.
         if item_count is not None:
             self.item_count = item_count
         else:
             self.item_count = len(self.collection)
         # Compute the number of the first and last available page
         if self.item_count > 0:
             self.first_page = 1
             self.page_count = int(math.ceil(float(self.item_count) /
                                             self.items_per_page))
             self.last_page = self.first_page + self.page_count - 1
             # Make sure that the requested page number is the range of
             # valid pages
             if self.page > self.last_page:
                 self.page = self.last_page
             elif self.page < self.first_page:
                 self.page = self.first_page
             # Note: the number of items on this page can be less than
             #       items_per_page if the last page is not full
             self.first_item = max(0, (self.item_count) - (self.page *
                                                           items_per_page))
             self.last_item = ((self.item_count - 1) - items_per_page *
                               (self.page - 1))
             self.items = list(self.collection[self.first_item:self.last_item + 1])
             # Links to previous and next page
             if self.page > self.first_page:
                 self.previous_page = self.page - 1
             else:
                 self.previous_page = None
             if self.page < self.last_page:
                 self.next_page = self.page + 1
             else:
                 self.next_page = None
         # No items available
         else:
             self.first_page = None
             self.page_count = 0
             self.last_page = None
             self.first_item = None
             self.last_item = None
             self.previous_page = None
             self.next_page = None
             self.items = []
         # This is a subclass of the 'list' type. Initialise the list now.
         list.__init__(self, reversed(self.items))
 def changed_tooltip(nodes):
     """
     Generates a html string for changed nodes in changeset page.
     It limits the output to 30 entries
     :param nodes: LazyNodesGenerator
     """
     if nodes:
         pref = ': <br/> '
         suf = ''
         if len(nodes) > 30:
             suf = '<br/>' + _(' and %s more') % (len(nodes) - 30)
         return literal(pref + '<br/> '.join([safe_unicode(x.path)
                                              for x in nodes[:30]]) + suf)
     else:
         return ': ' + _('No Files')
 def repo_link(groups_and_repos):
     """
     Makes a breadcrumbs link to repo within a group
     joins &raquo; on each group to create a fancy link
     ex::
         group >> subgroup >> repo
     :param groups_and_repos:
     """
     groups, repo_name = groups_and_repos
     if not groups:
         return repo_name
     else:
         def make_link(group):
             return link_to(group.name, url('repos_group_home',
                                            group_name=group.group_name))
         return literal(' &raquo; '.join(map(make_link, groups)) + \
                        " &raquo; " + repo_name)
 def fancy_file_stats(stats):
     """
     Displays a fancy two colored bar for number of added/deleted
     lines of code on file
     :param stats: two element list of added/deleted lines of code
     """
     a, d, t = stats[0], stats[1], stats[0] + stats[1]
     width = 100
     unit = float(width) / (t or 1)
     # needs > 9% of width to be visible or 0 to be hidden
     a_p = max(9, unit * a) if a > 0 else 0
     d_p = max(9, unit * d) if d > 0 else 0
     p_sum = a_p + d_p
     if p_sum > width:
         #adjust the percentage to be == 100% since we adjusted to 9
         if a_p > d_p:
             a_p = a_p - (p_sum - width)
         else:
             d_p = d_p - (p_sum - width)
     a_v = a if a > 0 else ''
     d_v = d if d > 0 else ''
     def cgen(l_type):
         mapping = {'tr':'top-right-rounded-corner',
                    'tl':'top-left-rounded-corner',
                    'br':'bottom-right-rounded-corner',
                    'bl':'bottom-left-rounded-corner'}
         map_getter = lambda x:mapping[x]
         if l_type == 'a' and d_v:
             #case when added and deleted are present
             return ' '.join(map(map_getter, ['tl', 'bl']))
         if l_type == 'a' and not d_v:
             return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
         if l_type == 'd' and a_v:
             return ' '.join(map(map_getter, ['tr', 'br']))
         if l_type == 'd' and not a_v:
             return ' '.join(map(map_getter, ['tr', 'br', 'tl', 'bl']))
     d_a = '<div class="added %s" style="width:%s%%">%s</div>' % (cgen('a'),
                                                                  a_p, a_v)
     d_d = '<div class="deleted %s" style="width:%s%%">%s</div>' % (cgen('d'),
                                                                    d_p, d_v)
     return literal('<div style="width:%spx">%s%s</div>' % (width, d_a, d_d))
 def urlify_text(text_):
     import re
     url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]'''
                          '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''')
     def url_func(match_obj):
         url_full = match_obj.groups()[0]
         return '<a href="%(url)s">%(url)s</a>' % ({'url':url_full})
     return literal(url_pat.sub(url_func, text_))
 def urlify_commit(text_):
     import re
     import traceback
     try:
         conf = config['app_conf']
         URL_PAT = re.compile(r'%s' % conf.get('url_pat'))
         if URL_PAT:
             ISSUE_SERVER = conf.get('issue_server')
             ISSUE_PREFIX = conf.get('issue_prefix')
             def url_func(match_obj):
                 issue_id = match_obj.groups()[0]
                 tmpl = (
                 '<a class="%(cls)s" href="%(url)s">'
                 ' %(issue-prefix)s%(id-repr)s'
                 ' <a class="%(cls)s" href="%(url)s">'
                 '%(issue-prefix)s%(id-repr)s'
                 '</a>'
+                )
                 return tmpl % (
+                    {
                      'cls':'issue-tracker-link',
                      'url':ISSUE_SERVER.replace('{id}',issue_id),
                      'id-repr':issue_id,
                      'issue-prefix':ISSUE_PREFIX,
                      'serv':ISSUE_SERVER,
+                    }
+                )
             return literal(URL_PAT.sub(url_func, text_))
     except:
         log.error(traceback.format_exc())
         pass
     return text_
 def rst(source):
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst(source))
 def rst_w_mentions(source):
     """
     Wrapped rst renderer with @mention highlighting
     :param source:
     """
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst_with_mentions(source))

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -941,385 +941,405 @@ tbody .yui-dt-editable { cursor: pointer @@
     white-space: nowrap;
+}
 .yui-skin-sam .yui-dt-paginator .yui-dt-first,
 .yui-skin-sam .yui-dt-paginator .yui-dt-last,
 .yui-skin-sam .yui-dt-paginator .yui-dt-selected { padding: 2px 6px }
 .yui-skin-sam .yui-dt-paginator a.yui-dt-first,
 .yui-skin-sam .yui-dt-paginator a.yui-dt-last { text-decoration: none }
 .yui-skin-sam .yui-dt-paginator .yui-dt-previous,
 .yui-skin-sam .yui-dt-paginator .yui-dt-next { display: none }
 .yui-skin-sam a.yui-dt-page {
     border: 1px solid #cbcbcb;
     padding: 2px 6px;
     text-decoration: none;
     background-color: #fff;
+}
 .yui-skin-sam .yui-dt-selected {
     border: 1px solid #fff;
     background-color: #fff;
+}
 #content #left {
 	left: 0;
 	width: 280px;
 	position: absolute;
+}
 #content #right {
 	margin: 0 60px 10px 290px;
+}
 #content div.box {
 	clear: both;
 	overflow: hidden;
 	background: #fff;
 	margin: 0 0 10px;
 	padding: 0 0 10px;
 	-webkit-border-radius: 4px 4px 4px 4px;
 	-khtml-border-radius: 4px 4px 4px 4px;
 	-moz-border-radius: 4px 4px 4px 4px;
 	border-radius: 4px 4px 4px 4px;
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 #content div.box-left {
 	width: 49%;
 	clear: none;
 	float: left;
 	margin: 0 0 10px;
+}
 #content div.box-right {
 	width: 49%;
 	clear: none;
 	float: right;
 	margin: 0 0 10px;
+}
 #content div.box div.title {
 	clear: both;
 	overflow: hidden;
 	background-color: #eedc94;
 	background-repeat: repeat-x;
 	background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
 		to(#eedc94) );
 	background-image: -moz-linear-gradient(top, #003b76, #00376e);
 	background-image: -ms-linear-gradient(top, #003b76, #00376e);
 	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
 		color-stop(100%, #00376e) );
 	background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
 	background-image: -o-linear-gradient(top, #003b76, #00376e) );
 	background-image: linear-gradient(top, #003b76, #00376e);
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
 		endColorstr='#00376e', GradientType=0 );
 	margin: 0 0 20px;
 	padding: 0;
+}
 #content div.box div.title h5 {
 	float: left;
 	border: none;
 	color: #fff;
 	text-transform: uppercase;
 	margin: 0;
 	padding: 11px 0 11px 10px;
+}
 #content div.box div.title .link-white{
 	color: #FFFFFF;
+}
 #content div.box div.title ul.links li {
 	list-style: none;
 	float: left;
 	margin: 0;
 	padding: 0;
+}
 #content div.box div.title ul.links li a {
 	border-left: 1px solid #316293;
 	color: #FFFFFF;
 	display: block;
 	float: left;
 	font-size: 13px;
 	font-weight: 700;
 	height: 1%;
 	margin: 0;
 	padding: 11px 22px 12px;
 	text-decoration: none;
+}
 #content div.box h1,#content div.box h2,#content div.box h3,#content div.box h4,#content div.box h5,#content div.box h6
+	{
 	clear: both;
 	overflow: hidden;
 	border-bottom: 1px solid #DDD;
 	margin: 10px 20px;
 	padding: 0 0 15px;
+}
 #content div.box p {
 	color: #5f5f5f;
 	font-size: 12px;
 	line-height: 150%;
 	margin: 0 24px 10px;
 	padding: 0;
+}
 #content div.box blockquote {
 	border-left: 4px solid #DDD;
 	color: #5f5f5f;
 	font-size: 11px;
 	line-height: 150%;
 	margin: 0 34px;
 	padding: 0 0 0 14px;
+}
 #content div.box blockquote p {
 	margin: 10px 0;
 	padding: 0;
+}
 #content div.box dl {
 	margin: 10px 0px;
+}
 #content div.box dt {
 	font-size: 12px;
 	margin: 0;
+}
 #content div.box dd {
 	font-size: 12px;
 	margin: 0;
 	padding: 8px 0 8px 15px;
+}
 #content div.box li {
 	font-size: 12px;
 	padding: 4px 0;
+}
 #content div.box ul.disc,#content div.box ul.circle {
 	margin: 10px 24px 10px 38px;
+}
 #content div.box ul.square {
 	margin: 10px 24px 10px 40px;
+}
 #content div.box img.left {
 	border: none;
 	float: left;
 	margin: 10px 10px 10px 0;
+}
 #content div.box img.right {
 	border: none;
 	float: right;
 	margin: 10px 0 10px 10px;
+}
 #content div.box div.messages {
 	clear: both;
 	overflow: hidden;
 	margin: 0 20px;
 	padding: 0;
+}
 #content div.box div.message {
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 10px 0;
 	padding: 5px 0;
     white-space: pre-wrap;
+}
 #content div.box div.expand{
 position:absolute;
 width:inherit;
 height:14px;
 font-size:14px;
 text-align:left;
 cursor: pointer;
 font-family: monospace;
 color:#003367;
 /*
 background:-webkit-gradient(linear,0% 50%,100% 50%,color-stop(0%,rgba(255,255,255,0)),color-stop(100%,rgba(255,255,255,1)));
 background:-webkit-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
 background:-moz-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
 background:-o-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
 background:-ms-linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
 background:linear-gradient(top,rgba(255,255,255,0),rgba(255,255,255,1));
 */
 display: none;
+}
 #content div.box div.message a {
 	font-weight: 400 !important;
+}
 #content div.box div.message div.image {
 	float: left;
 	margin: 9px 0 0 5px;
 	padding: 6px;
+}
 #content div.box div.message div.image img {
 	vertical-align: middle;
 	margin: 0;
+}
 #content div.box div.message div.text {
 	float: left;
 	margin: 0;
 	padding: 9px 6px;
+}
 #content div.box div.message div.dismiss a {
 	height: 16px;
 	width: 16px;
 	display: block;
 	background: url("../images/icons/cross.png") no-repeat;
 	margin: 15px 14px 0 0;
 	padding: 0;
+}
 #content div.box div.message div.text h1,#content div.box div.message div.text h2,#content div.box div.message div.text h3,#content div.box div.message div.text h4,#content div.box div.message div.text h5,#content div.box div.message div.text h6
+	{
 	border: none;
 	margin: 0;
 	padding: 0;
+}
 #content div.box div.message div.text span {
 	height: 1%;
 	display: block;
 	margin: 0;
 	padding: 5px 0 0;
+}
 #content div.box div.message-error {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #FBE3E4;
 	border: 1px solid #FBC2C4;
 	color: #860006;
+}
 #content div.box div.message-error h6 {
 	color: #860006;
+}
 #content div.box div.message-warning {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #FFF6BF;
 	border: 1px solid #FFD324;
 	color: #5f5200;
+}
 #content div.box div.message-warning h6 {
 	color: #5f5200;
+}
 #content div.box div.message-notice {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #8FBDE0;
 	border: 1px solid #6BACDE;
 	color: #003863;
+}
 #content div.box div.message-notice h6 {
 	color: #003863;
+}
 #content div.box div.message-success {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #E6EFC2;
 	border: 1px solid #C6D880;
 	color: #4e6100;
+}
 #content div.box div.message-success h6 {
 	color: #4e6100;
+}
 #content div.box div.form div.fields div.field {
 	height: 1%;
 	border-bottom: 1px solid #DDD;
 	clear: both;
 	margin: 0;
 	padding: 10px 0;
+}
 #content div.box div.form div.fields div.field-first {
 	padding: 0 0 10px;
+}
 #content div.box div.form div.fields div.field-noborder {
 	border-bottom: 0 !important;
+}
 #content div.box div.form div.fields div.field span.error-message {
 	height: 1%;
 	display: inline-block;
 	color: red;
 	margin: 8px 0 0 4px;
 	padding: 0;
+}
 #content div.box div.form div.fields div.field span.success {
 	height: 1%;
 	display: block;
 	color: #316309;
 	margin: 8px 0 0;
 	padding: 0;
+}
 #content div.box div.form div.fields div.field div.label {
 	left: 70px;
 	width: 155px;
 	position: absolute;
 	margin: 0;
 	padding: 5px 0 0 0px;
+}
 #content div.box div.form div.fields div.field div.label-summary {
     left: 30px;
     width: 155px;
     position: absolute;
     margin: 0;
     padding: 0px 0 0 0px;
+}
 #content div.box-left div.form div.fields div.field div.label,
 #content div.box-right div.form div.fields div.field div.label,
 #content div.box-left div.form div.fields div.field div.label,
 #content div.box-left div.form div.fields div.field div.label-summary,
 #content div.box-right div.form div.fields div.field div.label-summary,
 #content div.box-left div.form div.fields div.field div.label-summary
+	{
 	clear: both;
 	overflow: hidden;
 	left: 0;
 	width: auto;
 	position: relative;
 	margin: 0;
 	padding: 0 0 8px;
+}
 #content div.box div.form div.fields div.field div.label-select {
 	padding: 5px 0 0 5px;
+}
 #content div.box-left div.form div.fields div.field div.label-select,
 #content div.box-right div.form div.fields div.field div.label-select
+	{
 	padding: 0 0 8px;
+}
 #content div.box-left div.form div.fields div.field div.label-textarea,
 #content div.box-right div.form div.fields div.field div.label-textarea
+	{
 	padding: 0 0 8px !important;
+}
 #content div.box div.form div.fields div.field div.label label,div.label label
+	{
 	color: #393939;
 	font-weight: 700;
+}
 #content div.box div.form div.fields div.field div.label label,div.label-summary label
+    {
     color: #393939;
     font-weight: 700;
+}
 #content div.box div.form div.fields div.field div.input {
 	margin: 0 0 0 200px;
+}
@@ @@ -1926,809 +1946,817 @@ div.form div.fields div.field div.button @@
 	clear: both;
 	overflow: hidden;
 	text-align: right;
 	margin: 0;
 	padding: 10px 14px 0px 5px;
+}
 #quick_login div.form div.links {
 	clear: both;
 	overflow: hidden;
 	margin: 10px 0 0;
 	padding: 0 0 2px;
+}
 #register div.title {
 	clear: both;
 	overflow: hidden;
 	position: relative;
     background-color: #eedc94;
     background-repeat: repeat-x;
     background-image: -khtml-gradient(linear, left top, left bottom, from(#fceec1),
         to(#eedc94) );
     background-image: -moz-linear-gradient(top, #003b76, #00376e);
     background-image: -ms-linear-gradient(top, #003b76, #00376e);
     background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #003b76),
         color-stop(100%, #00376e) );
     background-image: -webkit-linear-gradient(top, #003b76, #00376e) );
     background-image: -o-linear-gradient(top, #003b76, #00376e) );
     background-image: linear-gradient(top, #003b76, #00376e);
     filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#003b76',
         endColorstr='#00376e', GradientType=0 );
 	margin: 0 auto;
 	padding: 0;
+}
 #register div.inner {
 	background: #FFF;
 	border-top: none;
 	border-bottom: none;
 	margin: 0 auto;
 	padding: 20px;
+}
 #register div.form div.fields div.field div.label {
 	width: 135px;
 	float: left;
 	text-align: right;
 	margin: 2px 10px 0 0;
 	padding: 5px 0 0 5px;
+}
 #register div.form div.fields div.field div.input input {
 	width: 300px;
 	background: #FFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000;
 	font-size: 11px;
 	margin: 0;
 	padding: 7px 7px 6px;
+}
 #register div.form div.fields div.buttons {
 	clear: both;
 	overflow: hidden;
 	border-top: 1px solid #DDD;
 	text-align: left;
 	margin: 0;
 	padding: 10px 0 0 150px;
+}
 #register div.form div.activation_msg {
 	padding-top: 4px;
 	padding-bottom: 4px;
+}
 #journal .journal_day {
 	font-size: 20px;
 	padding: 10px 0px;
 	border-bottom: 2px solid #DDD;
 	margin-left: 10px;
 	margin-right: 10px;
+}
 #journal .journal_container {
 	padding: 5px;
 	clear: both;
 	margin: 0px 5px 0px 10px;
+}
 #journal .journal_action_container {
 	padding-left: 38px;
+}
 #journal .journal_user {
 	color: #747474;
 	font-size: 14px;
 	font-weight: bold;
 	height: 30px;
+}
 #journal .journal_icon {
 	clear: both;
 	float: left;
 	padding-right: 4px;
 	padding-top: 3px;
+}
 #journal .journal_action {
 	padding-top: 4px;
 	min-height: 2px;
 	float: left
+}
 #journal .journal_action_params {
 	clear: left;
 	padding-left: 22px;
+}
 #journal .journal_repo {
 	float: left;
 	margin-left: 6px;
 	padding-top: 3px;
+}
 #journal .date {
 	clear: both;
 	color: #777777;
 	font-size: 11px;
 	padding-left: 22px;
+}
 #journal .journal_repo .journal_repo_name {
 	font-weight: bold;
 	font-size: 1.1em;
+}
 #journal .compare_view {
 	padding: 5px 0px 5px 0px;
 	width: 95px;
+}
 .journal_highlight {
 	font-weight: bold;
 	padding: 0 2px;
 	vertical-align: bottom;
+}
 .trending_language_tbl,.trending_language_tbl td {
 	border: 0 !important;
 	margin: 0 !important;
 	padding: 0 !important;
+}
 .trending_language_tbl,.trending_language_tbl tr {
     border-spacing: 1px;
+}
 .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;
+}
 .tablerow0 {
 	background-color: #F8F8F8;
+}
 .tablerow1 {
-	background-color: #F8F8F8;
+    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 {
 	white-space: pre-wrap;
+}
 #changeset_content .container .left .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;
+}
 .cs_files .cs_added {
 	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 {
 	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 {
 	background: url("../images/icons/page_white_delete.png") no-repeat
 		scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 #graph {
 	overflow: hidden;
+}
 #graph_nodes {
 	float: left;
 	margin-right: -6px;
 	margin-top: 0px;
+}
 #graph_content {
 	width: 80%;
 	float: left;
+}
 #graph_content .container_header {
 	border-bottom: 1px solid #DDD;
 	padding: 10px;
 	height: 25px;
+}
 #graph_content #rev_range_container {
-	padding: 5px 20px;
+	padding: 7px 20px;
 	float: left;
+}
 #graph_content .container {
 	border-bottom: 1px solid #DDD;
 	height: 55px;
 	overflow: hidden;
+}
 #graph_content .container .right {
 	float: right;
 	width: 23%;
 	text-align: right;
+}
 #graph_content .container .left {
 	float: left;
 	width: 25%;
 	padding-left: 5px;
+}
 #graph_content .container .mid {
 	float: left;
 	width: 49%;
+}
 #graph_content .container .left .date {
 	color: #444444;
 	padding-left: 22px;
+}
 #graph_content .container .left .author {
 	height: 22px;
+}
 #graph_content .container .left .author .user {
 	color: #444444;
 	float: left;
 	margin-left: -4px;
 	margin-top: 4px;
+}
 #graph_content .container .left .message {
 	font-size: 100%;
 	padding-top: 3px;
 	white-space: pre-wrap;
 	border: 1px solid red;
 	position: relative;
 	top: -30px;
 	left: 40%;
 	width: 30%;
+}
 #graph_content .container .left .message a:hover{
 	text-decoration: none;
+}
 .right div {
 	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;
 	-moz-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;
   -moz-border-radius: 3px;
   border-radius: 3px;
   margin-right: 2px;
+}
 .right .parent {
 	color: #666666;
+}
 .right .logtags{
 	padding: 2px 2px 2px 2px;
+}
 .right .logtags .branchtag,.logtags .branchtag {
   padding: 1px 3px 1px 3px;
   background-color: #bfbfbf;
   font-size: 10px;
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
+}
 .right .logtags .branchtag a:hover,.logtags .branchtag a{
 	color: #ffffff;
+}
 .right .logtags .branchtag a:hover,.logtags .branchtag a:hover{
 	text-decoration: none;
 	color: #ffffff;
+}
 .right .logtags .tagtag,.logtags .tagtag {
   padding: 1px 3px 1px 3px;
   background-color: #62cffc;
   font-size: 10px;
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-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 {
   padding: 1px 3px 2px;
   background-color: #46A546;
   font-size: 9.75px;
   font-weight: bold;
   color: #ffffff;
   text-transform: uppercase;
   white-space: nowrap;
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
+}
 .right .logbooks .bookbook,.logbooks .bookbook a{
 	color: #ffffff;
+}
 .right .logbooks .bookbook,.logbooks .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;
     -moz-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;
+}
 table.code-browser .browser-file {
 	background: url("../images/icons/document_16.png") no-repeat scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	text-align: left;
+}
 .diffblock .changeset_header {
     height: 16px;
+}
 .diffblock .changeset_file {
 	background: url("../images/icons/file.png") no-repeat scroll 3px;
 	text-align: left;
 	float: left;
 	padding: 2px 0px 2px 22px;
+}
 .diffblock .diff-menu-wrapper{
 	float: left;
+}
 .diffblock .diff-menu{
     position: absolute;
     background: none repeat scroll 0 0 #FFFFFF;
     border-color: #003367 #666666 #666666;
     border-right: 1px solid #666666;
     border-style: solid solid solid;
     border-width: 1px;
     box-shadow: 2px 8px 4px rgba(0, 0, 0, 0.2);
     margin-top:5px;
     margin-left:1px;
+}
 .diffblock .diff-actions {
     padding: 2px 0px 0px 2px;
     float: left;
+}
 .diffblock  .diff-menu ul li {
 	padding: 0px 0px 0px 0px !important;
+}
 .diffblock  .diff-menu ul li a{
 	display: block;
 	padding: 3px 8px 3px 8px !important;
+}
 .diffblock  .diff-menu ul li a:hover{
     text-decoration: none;
     background-color: #EEEEEE;
+}
 table.code-browser .browser-dir {
 	background: url("../images/icons/folder_16.png") no-repeat scroll 3px;
 	height: 16px;
 	padding-left: 20px;
 	text-align: left;
+}
 .box .search {
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 0 20px 10px;
+}
 .box .search div.search_path {
 	background: none repeat scroll 0 0 #EEE;
 	border: 1px solid #CCC;
 	color: blue;
 	margin-bottom: 10px;
 	padding: 10px 0;
+}
 .box .search div.search_path div.link {
 	font-weight: 700;
 	margin-left: 25px;
+}
 .box .search div.search_path div.link a {
 	color: #003367;
 	cursor: pointer;
 	text-decoration: none;
+}
 #path_unlock {
 	color: red;
 	font-size: 1.2em;
 	padding-left: 4px;
+}
 .info_box span {
 	margin-left: 3px;
 	margin-right: 3px;
+}
 .info_box .rev {
 	color: #003367;
 	font-size: 1.6em;
 	font-weight: bold;
 	vertical-align: sub;
+}
 .info_box input#at_rev,.info_box input#size {
 	background: #FFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000;
 	font-size: 12px;
 	margin: 0;
 	padding: 1px 5px 1px;
+}
 .info_box input#view {
 	text-align: center;
 	padding: 4px 3px 2px 2px;
+}
 .yui-overlay,.yui-panel-container {
 	visibility: hidden;
 	position: absolute;
 	z-index: 2;
+}
 .yui-tt {
 	visibility: hidden;
 	position: absolute;
 	color: #666;
 	background-color: #FFF;
 	border: 2px solid #003367;
 	font: 100% sans-serif;
 	width: auto;
 	opacity: 1px;
 	padding: 8px;
 	white-space: pre-wrap;
 	-webkit-border-radius: 8px 8px 8px 8px;
 	-khtml-border-radius: 8px 8px 8px 8px;
 	-moz-border-radius: 8px 8px 8px 8px;
 	border-radius: 8px 8px 8px 8px;
 	box-shadow: 0 2px 2px rgba(0, 0, 0, 0.6);
+}
 .ac {
 	vertical-align: top;
+}
 .ac .yui-ac {
 	position: relative;
 	font-size: 100%;
+}
 .ac .perm_ac {
 	width: 15em;
+}
 .ac .yui-ac-input {
 	width: 100%;
+}
 .ac .yui-ac-container {
 	position: absolute;
 	top: 1.6em;
 	width: 100%;
+}
 .ac .yui-ac-content {
 	position: absolute;
 	width: 100%;
 	border: 1px solid gray;
 	background: #fff;
 	overflow: hidden;
 	z-index: 9050;
+}
 .ac .yui-ac-shadow {
 	position: absolute;
 	width: 100%;
 	background: #000;
 	-moz-opacity: 0.1px;
 	opacity: .10;
 	filter: alpha(opacity =     10);
 	z-index: 9049;
 	margin: .3em;
+}
 .ac .yui-ac-content ul {
 	width: 100%;
 	margin: 0;
 	padding: 0;
+}
 .ac .yui-ac-content li {
 	cursor: default;
 	white-space: nowrap;
 	margin: 0;
 	padding: 2px 5px;
+}
 .ac .yui-ac-content li.yui-ac-prehighlight {
 	background: #B3D4FF;
+}
 .ac .yui-ac-content li.yui-ac-highlight {
 	background: #556CB5;
 	color: #FFF;
+}
 .follow {
 	background: url("../images/icons/heart_add.png") no-repeat scroll 3px;
 	height: 16px;
 	width: 20px;
 	cursor: pointer;
 	display: block;
 	float: right;
 	margin-top: 2px;
+}
 .following {
 	background: url("../images/icons/heart_delete.png") no-repeat scroll 3px;
 	height: 16px;
 	width: 20px;
 	cursor: pointer;
 	display: block;
 	float: right;
 	margin-top: 2px;
+}
 .currently_following {
 	padding-left: 10px;
 	padding-bottom: 5px;
+}
@@ @@ -3798,305 +3826,306 @@ form.comment-form { @@
 .comment-inline-form .clearfix{
     background: #EEE;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     padding: 5px;
+}
 div.comment-inline-form {
     margin-top: 5px;
     padding:2px 6px 8px 6px;
+}
 .comment-inline-form strong {
     display: block;
     margin-bottom: 15px;
+}
 .comment-inline-form textarea {
     width: 100%;
     height: 100px;
     font-family: 'Monaco', 'Courier', 'Courier New', monospace;
+}
 form.comment-inline-form {
     margin-top: 10px;
     margin-left: 10px;
+}
 .comment-inline-form-submit {
     margin-top: 5px;
     margin-left: 525px;
+}
 .file-comments {
     display: none;
+}
 .comment-inline-form .comment {
     margin-left: 10px;
+}
 .comment-inline-form .comment-help{
     padding: 0px 0px 2px 0px;
     color: #666666;
     font-size: 10px;
+}
 .comment-inline-form .comment-button{
     padding-top:5px;
+}
 /** comment inline **/
 .inline-comments {
     padding:10px 20px;
+}
 .inline-comments div.rst-block  {
 	clear:both;
 	overflow:hidden;
 	margin:0;
 	padding:0 20px 0px;
+}
 .inline-comments .comment {
     border: 1px solid #ddd;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     margin: 3px 3px 5px 5px;
     background-color: #FAFAFA;
+}
 .inline-comments .comment-wrapp{
 	padding:1px;
+}
 .inline-comments .comment .meta {
     background: #f8f8f8;
     padding: 4px;
     border-bottom: 1px solid #ddd;
+}
 .inline-comments .comment .meta img {
     vertical-align: middle;
+}
 .inline-comments .comment .meta .user {
     font-weight: bold;
+}
 .inline-comments .comment .meta .date {
+}
 .inline-comments .comment .text {
     background-color: #FAFAFA;
+}
 .inline-comments .comments-number{
     padding:0px 0px 10px 0px;
     font-weight: bold;
     color: #666;
     font-size: 16px;
+}
 .inline-comments-button .add-comment{
 	margin:10px 5px !important;
+}
 .notifications{
 	width:22px;
     padding:2px;
 	float:right;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
     text-align: center;
     margin: 0px -10px 0px 5px;
     background-color: #DEDEDE;
+}
 .notifications a{
 	color:#888 !important;
 	display: block;
 	font-size: 10px
+}
 .notifications a:hover{
 	text-decoration: none !important;
+}
 .notification-header{
 	padding-top:6px;
+}
 .notification-header .desc{
 	font-size: 16px;
     height: 24px;
     float: left
+}
 .notification-list .container.unread{
+}
 .notification-header .gravatar{
+}
 .notification-header .desc.unread{
     font-weight: bold;
     font-size: 17px;
+}
 .notification-header .delete-notifications{
     float: right;
     padding-top: 8px;
     cursor: pointer;
+}
 .notification-subject{
     clear:both;
     border-bottom: 1px solid #eee;
     padding:5px 0px 5px 38px;
+}
 /*****************************************************************************
                                   DIFFS CSS
 ******************************************************************************/
 div.diffblock {
     overflow: auto;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
     -webkit-border-radius: 6px 6px 0px 0px;
     -moz-border-radius: 6px 6px 0px 0px;
     border-radius: 6px 6px 0px 0px;
+}
 div.diffblock.margined{
     margin: 0px 20px 0px 20px;
+}
 div.diffblock .code-header{
     border-bottom: 1px solid #CCCCCC;
     background: #EEEEEE;
     padding:10px 0 10px 0;
     height: 14px;
+}
 div.diffblock .code-header.cv{
     height: 34px;
+}
 div.diffblock .code-header-title{
 	padding: 0px 0px 10px 5px !important;
 	margin: 0 !important;
+}
 div.diffblock .code-header .date{
     float:left;
     text-transform: uppercase;
     padding: 2px 0px 0px 2px;
+}
 div.diffblock .code-header div{
     margin-left:4px;
     font-weight: bold;
     font-size: 14px;
+}
 div.diffblock .code-body{
     background: #FFFFFF;
+}
 div.diffblock pre.raw{
     background: #FFFFFF;
     color:#000000;
+}
 table.code-difftable{
     border-collapse: collapse;
     width: 99%;
+}
 table.code-difftable td {
     padding: 0 !important;
     background: none !important;
     border:0 !important;
     vertical-align: none !important;
+}
 table.code-difftable .context{
     background:none repeat scroll 0 0 #DDE7EF;
+}
 table.code-difftable .add{
     background:none repeat scroll 0 0 #DDFFDD;
+}
 table.code-difftable .add ins{
     background:none repeat scroll 0 0 #AAFFAA;
     text-decoration:none;
+}
 table.code-difftable .del{
     background:none repeat scroll 0 0 #FFDDDD;
+}
 table.code-difftable .del del{
     background:none repeat scroll 0 0 #FFAAAA;
     text-decoration:none;
+}
 /** LINE NUMBERS **/
 table.code-difftable .lineno{
     padding-left:2px;
     padding-right:2px;
     text-align:right;
     width:32px;
     -moz-user-select:none;
     -webkit-user-select: none;
     border-right: 1px solid #CCC !important;
     border-left: 0px solid #CCC !important;
     border-top: 0px solid #CCC !important;
     border-bottom: none !important;
     vertical-align: middle !important;
+}
 table.code-difftable .lineno.new {
+}
 table.code-difftable .lineno.old {
+}
 table.code-difftable .lineno a{
     color:#747474 !important;
     font:11px "Bitstream Vera Sans Mono",Monaco,"Courier New",Courier,monospace !important;
     letter-spacing:-1px;
     text-align:right;
     padding-right: 2px;
     cursor: pointer;
     display: block;
     width: 32px;
+}
 table.code-difftable .lineno-inline{
     background:none repeat scroll 0 0 #FFF !important;
     padding-left:2px;
     padding-right:2px;
     text-align:right;
     width:30px;
     -moz-user-select:none;
     -webkit-user-select: none;
+}
 /** CODE **/
 table.code-difftable .code {
     display: block;
     width: 100%;
+}
 table.code-difftable .code td{
     margin:0;
     padding:0;
+}
 table.code-difftable .code pre{
     margin:0;
     padding:0;
     height: 17px;
     line-height: 17px;
+}
 .diffblock.margined.comm .line .code:hover{
     background-color:#FFFFCC !important;
     cursor: pointer !important;
     background-image:url("../images/icons/comment_add.png") !important;
     background-repeat:no-repeat !important;
     background-position: right !important;
     background-position: 0% 50% !important;
+}
 .diffblock.margined.comm .line .code.no-comment:hover{
 	background-image: none !important;
 	cursor: auto !important;
 	background-color: inherit !important;
+}
@@ \ No newline at end of file @@
+}

rhodecode/public/js/graph.js

➞

Show inline comments

 // branch_renderer.js - Rendering of branch DAGs on the client side
 //
 // Copyright 2010 Marcin Kuzminski <marcin AT python-works DOT com>
 // Copyright 2008 Jesper Noehr <jesper AT noehr DOT org>
 // Copyright 2008 Dirkjan Ochtman <dirkjan AT ochtman DOT nl>
 // Copyright 2006 Alexander Schremmer <alex AT alexanderweb DOT de>
 //
 // derived from code written by Scott James Remnant <scott@ubuntu.com>
 // Copyright 2005 Canonical Ltd.
 //
 // This software may be used and distributed according to the terms
 // of the GNU General Public License, incorporated herein by reference.
 var colors = [
 	[ 1.0, 0.0, 0.0 ],
 	[ 1.0, 1.0, 0.0 ],
 	[ 0.0, 1.0, 0.0 ],
 	[ 0.0, 1.0, 1.0 ],
 	[ 0.0, 0.0, 1.0 ],
 	[ 1.0, 0.0, 1.0 ],
 	[ 1.0, 1.0, 0.0 ],
 	[ 0.0, 0.0, 0.0 ]
 ];
 function BranchRenderer() {
 	this.canvas = document.getElementById("graph_canvas");
 	if (navigator.userAgent.indexOf('MSIE') >= 0)
 		this.canvas = window.G_vmlCanvasManager.initElement(this.canvas);
 	this.ctx = this.canvas.getContext('2d');
 	this.ctx.strokeStyle = 'rgb(0, 0, 0)';
 	this.ctx.fillStyle = 'rgb(0, 0, 0)';
 	this.cur = [0, 0];
 	this.max_column = 1;
 	this.line_width = 2.5;
 	this.dot_radius = 5.5;
 	this.bg = [0, 4];
 	this.cell = [2, 0];
 	this.revlink = '';
 	this.scale = function(height) {
 		this.box_size = Math.floor(height/1.2);
 		this.cell_height = this.box_size;
 		this.bg_height = height;
+	}
 	this.setColor = function(color, bg, fg) {
 		color %= colors.length;
 		var red = (colors[color][0] * fg) || bg;
 		var green = (colors[color][1] * fg) || bg;
 		var blue = (colors[color][2] * fg) || bg;
 		red = Math.round(red * 255);
 		green = Math.round(green * 255);
 		blue = Math.round(blue * 255);
 		var s = 'rgb(' + red + ', ' + green + ', ' + blue + ')';
 		this.ctx.strokeStyle = s;
 		this.ctx.fillStyle = s;
+	}
 	this.render = function(data,pad) {
 		var idx = 1;
 		var rela = document.getElementById('graph');
 		var pad = pad;
 		var scale = 22;
 		for (var i in data) {
 			this.scale(scale);
 			var row = document.getElementById("chg_"+idx);
 			var	next = document.getElementById("chg_"+idx+1);
 			if(row == null){
 				continue
+			}
 			var extra = 0;
 			//skip this since i don't have DATE in my app
 			//if (next.is('.changesets-date')) {
 			//	extra = next.outerHeight();
 			//}
 			this.cell[1] += row.clientWidth;
 			this.bg[1] += this.bg_height;
 			cur = data[i];
 			nodeid = cur[0];
 			node = cur[1];
 			in_l = cur[2];
 			var pos_ = 26;
 			for (var j in in_l) {
 				line = in_l[j];
 				start = line[0];
 				end = line[1];
 				color = line[2];
 				if (start > this.max_column) {
 					this.max_column = start;
+				}
 				if (end > this.max_column) {
 					this.max_column = end;
+				}
 				this.setColor(color, 0.0, 0.65);
 				y = row.offsetTop-rela.offsetTop+row.offsetHeight/2;
 				y = row.offsetTop-rela.offsetTop+pos_;
 				x = pad-((this.cell[0] + this.box_size * start - 1) + this.bg_height-2);
 				this.ctx.lineWidth=this.line_width;
 				this.ctx.beginPath();
 				this.ctx.moveTo(x, y);
 				if (start == end)
+				{
 					x = pad-((1 + this.box_size * end) + this.bg_height-2);
 					y += row.offsetHeight;
 					this.ctx.lineTo(x,y+extra,3);
+				}
 				else
+				{
 					var x2 = pad-((1 + this.box_size * end) + this.bg_height-2);
 					var y2 = y + row.offsetHeight;
 					var ymid = (y+y2) / 2;
-					this.ctx.bezierCurveTo (x,ymid,x2,ymid,x2,y2);
 					this.ctx.bezierCurveTo(x,ymid,x2,ymid,x2,y2);
+				}
 				this.ctx.stroke();
+			}
 			column = node[0]
 			color = node[1]
 			radius = this.dot_radius;
-			y = row.offsetTop-rela.offsetTop+row.offsetHeight/2;
+			y = row.offsetTop-rela.offsetTop+pos_;
 			x = pad-(Math.round(this.cell[0] * scale/2 * column + radius) + 15 - (column*4));
 			this.ctx.beginPath();
 			this.setColor(color, 0.25, 0.75);
 			this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
 			this.ctx.fill();
 			idx++;
+		}
+	}
+}

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
 ${c.repo_name} ${_('Changelog')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('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" style="float:left">
 				          ${h.submit('set',_('Show'),class_="ui-btn")}
 				          ${h.text('size',size=1,value=c.size)}
 				          ${_('revisions')}
 				        </div>
 				        ${h.end_form()}
 					<div id="rev_range_container" style="display:none"></div>
                     <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
 					</div>
 				%for cnt,cs in enumerate(c.pagination):
-					<div id="chg_${cnt+1}" class="container ${'tablerow1' if cnt%2==0 else 'tablerow2'}">
+					<div id="chg_${cnt+1}" class="container ${'tablerow%s' % (cnt%2)}">
 						<div class="left">
 							<div>
 							${h.checkbox(cs.short_id,class_="changeset_range")}
 							<span class="tooltip" title="${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>
+							<span class="tooltip" title="${h.age(cs.date)}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>
 							</div>
 							<div class="author">
 								<div class="gravatar">
 									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),16)}"/>
 								</div>
 								<div title="${cs.author}" class="user">${h.person(cs.author)}</div>
 							</div>
                             <div class="date">${cs.date}</div>
 						</div>
 						<div class="mid">
 							<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 class="message">${h.urlify_commit(h.wrap_paragraphs(cs.message))}</div>
                             <div class="expand ${'tablerow%s' % (cnt%2)}">&darr; ${_('show more')} &darr;</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 cs.parents:
 									%for p_cs in reversed(cs.parents):
 										<div class="parent">${_('Parent')}
 											<span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
 											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
 										</div>
 									%endfor
 								   %else:
                                         <div class="parent">${_('No parents')}</div>
                                    %endif
 								<span class="logtags">
 									%if len(cs.parents)>1:
 									<span class="merge">${_('merge')}</span>
 									%endif
 									%if cs.branch:
 									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
 									   ${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%endif
 									%for tag in cs.tags:
 										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 										${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.raw_id))}</span>
 									%endfor
 								</span>
 						</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="${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__')}";
                     YUE.on(checkboxes,'click',function(e){
                         var checked_checkboxes = [];
                         for (pos in checkboxes){
                             if(checkboxes[pos].checked){
                                 checked_checkboxes.push(checkboxes[pos]);
+                            }
+                        }
                         if(checked_checkboxes.length>1){
                         	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 = "<a href="+url+">${_('Show selected changes __S -> __E')}</a>"
                         link = link.replace('__S',rev_start);
                         link = link.replace('__E',rev_end);
                         YUD.get('rev_range_container').innerHTML = link;
                         YUD.setStyle('rev_range_container','display','');
+                        }
                         else{
                         	YUD.setStyle('rev_range_container','display','none');
+                        }
                     });
                     var msgs = YUQ('.message');
                     // get firts element height;
                     var el = YUQ('.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){
                     		YUD.setStyle(m.nextElementSibling,'display','block');
                     		YUD.setStyle(m.nextElementSibling,'margin-top',row_h-(h+14)+'px');
                     		YUD.setAttribute(m.nextElementSibling,'expand',h);
                     	};
+                    }
                     YUE.on(YUQ('.expand'),'click',function(e){
                     	var elem = e.currentTarget.parentElement.parentElement;
                     	YUD.setStyle(e.currentTarget,'display','none');
                     	YUD.setStyle(elem,'height',YUD.getAttribute(e.currentTarget,'expand')+'px');
                     	//redraw the graph max_w and jsdata are global vars
                         set_canvas(max_w);
                         var r = new BranchRenderer();
                         r.render(jsdata,max_w);
                     })
                     // 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);
                     	ypjax(url,id+'_changes_info',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;
                     	console.log(selected_branch);
                     	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(heads) {
 						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);
 						c.style.height=max_w+'px';
 						canvas.setAttribute('width',max_w);
 					};
 					var heads = 1;
 					var max_heads = 0;
 					var jsdata = ${c.jsdata|n};
 					for( var i=0;i<jsdata.length;i++){
 					    var m = Math.max.apply(Math, jsdata[i][1]);
 					    if (m>max_heads){
 					        max_heads = m;
+					    }
+					}
 					var max_w = Math.max(100,max_heads*25);
 					set_canvas(max_w);
 					var r = new BranchRenderer();
 					r.render(jsdata,max_w);
 				});
 			</script>
 		%else:
 			${_('There are no changes yet')}
 		%endif
     </div>
 </div>
 </%def>
@@ \ No newline at end of file @@
 </%def>

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('Changeset')} - r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
 </%def>
 <%def name="page_nav()">
     ${self.menu('changelog')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
 		<div class="diffblock">
 			<div class="code-header">
                 <div class="date">${c.changeset.revision}:
                   ${h.link_to(h.short_id(c.changeset.raw_id),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
                 <div class="date">
                   R${c.changeset.revision}:${h.link_to(h.short_id(c.changeset.raw_id),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
                   ${c.changeset.date}</div>
                 <span class="diff-actions">
                   <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white_text.png')}"/></a>
                   <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/down_16.png')}"/></a>
                 <div class="diff-actions">
                   <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
                   <a href="${h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>
                   ${c.ignorews_url()}
                   ${c.context_url()}
-                </span>
+                </div>
                 <div class="comments-number" style="float:right;padding-right:5px">${len(c.comments)} comment(s) (${c.inline_cnt} ${_('inline')})</div>
 			</div>
 		</div>
 	    <div id="changeset_content">
 			<div class="container">
 	             <div class="left">
 	                 <div class="author">
 	                     <div class="gravatar">
 	                         <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/>
 	                     </div>
 	                     <span>${h.person(c.changeset.author)}</span><br/>
 	                     <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>
 	                 </div>
 	                 <div class="message">${h.urlify_commit(h.wrap_paragraphs(c.changeset.message))}</div>
 	             </div>
 	             <div class="right">
 		             <div class="changes">
                         % if len(c.changeset.affected_files) <= c.affected_files_cut_off:
 		                 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>
 		                 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>
 		                 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>
 	                    % else:
                          <span class="removed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="changed" title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
                          <span class="added"   title="${_('affected %s files') % len(c.changeset.affected_files)}">!</span>
 	                    % endif
 		             </div>
 		            %if c.changeset.parents:
 		             %for p_cs in reversed(c.changeset.parents):
 		                 <div class="parent">${_('Parent')}
                      <span class="changeset_id">${p_cs.revision}:<span class="changeset_hash">${h.link_to(h.short_id(p_cs.raw_id),
 		                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}</span></span>
 		                 </div>
 		             %endfor
                     %else:
                         <div class="parent">${_('No parents')}</div>
                     %endif
 		         <span class="logtags">
                  %if len(c.changeset.parents)>1:
                  <span class="merge">${_('merge')}</span>
                  %endif
 		             <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
 		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %for tag in c.changeset.tags:
 		                 <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>
 		             %endfor
 		         </span>
 	                </div>
 	        </div>
 	        <span>
 	        ${_('%s files affected with %s additions and %s deletions:') % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}
 	        </span>
 	        <div class="cs_files">
 	                %for change,filenode,diff,cs1,cs2,stat in c.changes:
 	                    <div class="cs_${change}">
                             <div class="node">
                             %if change != 'removed':
                                 ${h.link_to(h.safe_unicode(filenode.path),c.anchor_url(filenode.changeset.raw_id,filenode.path)+"_target")}
                             %else:
                                 ${h.link_to(h.safe_unicode(filenode.path),h.url.current(anchor=h.FID('',filenode.path)))}
                             %endif
                             </div>
 		                    <div class="changes">${h.fancy_file_stats(stat)}</div>
 	                    </div>
 	                %endfor
 	                % if c.cut_off:
 	                  ${_('Changeset was too big and was cut off...')}
 	                % endif
 	        </div>
 	    </div>
     </div>
     ## diff block
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
     ${diff_block.diff_block(c.changes)}
     ## template for inline comment form
     <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>
     ${comment.comment_inline_form(c.changeset)}
     ${comment.comments(c.changeset)}
     <script type="text/javascript">
       var deleteComment = function(comment_id){
           var url = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}".replace('__COMMENT_ID__',comment_id);
           var postData = '_method=delete';
           var success = function(o){
               var n = YUD.get('comment-'+comment_id);
               n.parentNode.removeChild(n);
+          }
           ajaxPOST(url,postData,success);
+      }
       YUE.onDOMReady(function(){
           YUE.on(YUQ('.show-inline-comments'),'change',function(e){
               var show = 'none';
               var target = e.currentTarget;
               console.log(target);
               if(target.checked){
                   var show = ''
+              }
               console.log('aa')
               var boxid = YUD.getAttribute(target,'id_for');
               console.log(boxid);
               var comments = YUQ('#{0} .inline-comments'.format(boxid));
               console.log(comments)
               for(c in comments){
                  YUD.setStyle(comments[c],'display',show);
+              }
               var btns = YUQ('#{0} .inline-comments-button'.format(boxid));
               for(c in btns){
                   YUD.setStyle(btns[c],'display',show);
+               }
           })
           YUE.on(YUQ('.line'),'click',function(e){
               var tr = e.currentTarget;
               injectInlineForm(tr);
           });
           // inject comments into they proper positions
           var file_comments = YUQ('.inline-comment-placeholder');
           for (f in file_comments){
               var box = file_comments[f];
               var inlines = box.children;
               for(var i=0; i<inlines.length; i++){
                   try{
                     var inline = inlines[i];
                     var lineno = YUD.getAttribute(inlines[i],'line');
                     var lineid = "{0}_{1}".format(YUD.getAttribute(inline,'target_id'),lineno);
                     var target_line = YUD.get(lineid);
                     var add = createInlineAddButton(target_line.parentNode,'${_("add another comment")}');
                     YUD.insertAfter(add,target_line.parentNode);
                     var comment = new YAHOO.util.Element(tableTr('inline-comments',inline.innerHTML))
                     YUD.insertAfter(comment,target_line.parentNode);
                   }catch(e){
                 	  console.log(e);
+                  }
+              }
+          }
       })
     </script>
     </div>
 </%def>

rhodecode/templates/changeset/diff_block.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 ##usage:
 ## <%namespace name="diff_block" file="/changeset/diff_block.html"/>
 ## ${diff_block.diff_block(changes)}
 ##
 <%def name="diff_block(changes)">
 %for change,filenode,diff,cs1,cs2,stat in changes:
     %if change !='removed':
     <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}_target" style="clear:both;height:90px;margin-top:-60px"></div>
     <div id="${h.FID(filenode.changeset.raw_id,filenode.path)}" class="diffblock  margined comm">
         <div class="code-header">
             <div class="changeset_header">
                 <div class="changeset_file">
                     ${h.link_to_if(change!='removed',h.safe_unicode(filenode.path),h.url('files_home',repo_name=c.repo_name,
                     revision=filenode.changeset.raw_id,f_path=h.safe_unicode(filenode.path)))}
                 </div>
                 <span class="diff-actions">
                   <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" title="${_('diff')}"><img class="icon" src="${h.url('/images/icons/page_white_text.png')}"/></a>
                   <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white_text.png')}"/></a>
                   <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/down_16.png')}"/></a>
                 <div class="diff-actions">
                   <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}" title="${_('diff')}"><img class="icon" src="${h.url('/images/icons/page_white_go.png')}"/></a>
                   <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='raw')}" title="${_('raw diff')}"><img class="icon" src="${h.url('/images/icons/page_white.png')}"/></a>
                   <a href="${h.url('files_diff_home',repo_name=c.repo_name,f_path=h.safe_unicode(filenode.path),diff2=cs2,diff1=cs1,diff='download')}" title="${_('download diff')}"><img class="icon" src="${h.url('/images/icons/page_white_get.png')}"/></a>
                   ${c.ignorews_url(h.FID(filenode.changeset.raw_id,filenode.path))}
                   ${c.context_url(h.FID(filenode.changeset.raw_id,filenode.path))}
-                </span>
+                </div>
                 <span style="float:right;margin-top:-3px">
                   <label>
                   ${_('show inline comments')}
                   ${h.checkbox('',checked="checked",class_="show-inline-comments",id_for=h.FID(filenode.changeset.raw_id,filenode.path))}
                   </label>
                 </span>
             </div>
         </div>
         <div class="code-body">
             <div class="full_f_path" path="${h.safe_unicode(filenode.path)}"></div>
             ${diff|n}
         </div>
     </div>
     %endif
 %endfor
 </%def>
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)