kallithea Changeset - 5ba6fd9ab711

Changeset - 5ba6fd9ab711

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 13 years ago 2012-12-08 03:19:10
marcin@python-works.com

Reordered parents/children links ref #650

2 files changed with 57 insertions and 11 deletions:

rhodecode/public/css/style.css

rhodecode/templates/changeset/changeset.html

0 comments (0 inline, 0 general)

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -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;
+}

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -32,7 +32,28 @@ @@
     </script>
     <div class="table">
 		<div class="diffblock">
 			<div class="code-header">
             <div class="parents">
                 %if c.changeset.parents:
                  %for n, p_cs in enumerate(reversed(c.changeset.parents),1):
                     <span class="changeset_hash">&laquo; ${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)}</span>
                     <br>
                  %endfor
                  %else:
                     <span>${_('No parents')}</span>
                  %endif
             </div>
             <div class="children">
                 %if c.changeset.children:
                  %for n, p_cs in enumerate(reversed(c.changeset.children),1):
                     <span class="changeset_hash">${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)} &raquo;</span>
                     <br>
                  %endfor
                  %else:
                     <span>${_('No children')}</span>
                  %endif
             </div>
 			<div class="code-header banner">
                 <div class="hash">
                  r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
                 </div>
@@ @@ -80,16 +101,6 @@ @@
 	                    % 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>

0 comments (0 inline, 0 general)