# HG changeset patch # User Marcin Kuzminski # Date 2012-12-08 03:19:10 # Node ID 5ba6fd9ab711856bc328ea99e918a42132b79363 # Parent 6d599a3c0d67425c9bb67757526f9d61c7b30449 Reordered parents/children links ref #650 diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -4646,6 +4646,15 @@ div.diffblock .code-header{ padding:10px 0 10px 0; height: 14px; } + +div.diffblock .code-header.banner{ + border-bottom: 1px solid #CCCCCC; + background: #EEEEEE; + height: 14px; + margin: 0px 95px 0px 95px; + padding: 3px 3px 11px 3px; +} + div.diffblock .code-header.cv{ height: 34px; } @@ -4667,6 +4676,32 @@ div.diffblock .code-header div{ font-weight: bold; font-size: 14px; } + +div.diffblock .parents { + float: left; + height: 26px; + width:100px; + font-size: 10px; + font-weight: 400; + vertical-align: middle; + padding: 0px 2px 2px 2px; + background-color:#eeeeee; + border-bottom: 1px solid #CCCCCC; +} + +div.diffblock .children { + float: right; + height: 26px; + width:100px; + font-size: 10px; + font-weight: 400; + vertical-align: middle; + text-align: right; + padding: 0px 2px 2px 2px; + background-color:#eeeeee; + border-bottom: 1px solid #CCCCCC; +} + div.diffblock .code-body{ background: #FFFFFF; } diff --git a/rhodecode/templates/changeset/changeset.html b/rhodecode/templates/changeset/changeset.html --- a/rhodecode/templates/changeset/changeset.html +++ b/rhodecode/templates/changeset/changeset.html @@ -32,7 +32,28 @@
-
+
+ %if c.changeset.parents: + %for n, p_cs in enumerate(reversed(c.changeset.parents),1): + « ${h.link_to('%s:%s' % (p_cs.revision,p_cs.raw_id[:6]),h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)} +
+ %endfor + %else: + ${_('No parents')} + %endif +
+
+ %if c.changeset.children: + %for n, p_cs in enumerate(reversed(c.changeset.children),1): + ${h.link_to('%s:%s' % (p_cs.revision,p_cs.raw_id[:6]),h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)} » +
+ %endfor + %else: + ${_('No children')} + %endif +
+
${ungettext("%d comment", "%d comments", len(c.comments)) % len(c.comments)} ${ungettext("(%d inline)", "(%d inline)", c.inline_cnt) % c.inline_cnt}
-
+
@@ -80,16 +101,6 @@ % endif
- %if c.changeset.parents: - %for p_cs in reversed(c.changeset.parents): -
${_('Parent')} - ${p_cs.revision}:${h.link_to(h.short_id(p_cs.raw_id), - h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)} -
- %endfor - %else: -
${_('No parents')}
- %endif %if len(c.changeset.parents)>1: ${_('merge')}