kallithea Changeset - 671931f082c3

Changeset - 671931f082c3

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2010-05-24 00:58:40
marcin@python-works.com

added merge and parents indicators to changelog

2 files changed with 30 insertions and 1 deletions:

pylons_app/public/css/monoblue_custom.css

pylons_app/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

pylons_app/public/css/monoblue_custom.css

➞

Show inline comments

@@ @@ -476,6 +476,22 @@ canvas { @@
 .right .removed{
 	background: #FF8888;
+}
 .right .merge{
 	float: right;
 	vertical-align: top;
 	font-size: 60%;
 	font-weight: bold;
+}
 .right .merge img{
 	vertical-align: bottom;
+}
 .right .parent{
 float:right;
 font-size: 90%;
 font-family: monospace;
+}
 /** end of canvas **/
 /* FILE BROWSER */

pylons_app/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -40,7 +40,7 @@ from pylons_app.lib import filters @@
 				<div class="author">${cs.author}</div>
 				<div id="chg_${cnt}" class="message">
 					${h.link_to(cs.message,
-					h.url('changeset_home',repo_name=c.repo_name,revision=cs._short),
+					h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),
 					title=cs.message)}
 				</div>
 					<span class="logtags">
@@ @@ -55,6 +55,19 @@ from pylons_app.lib import filters @@
 					<span class="changed" title="${_('changed')}">${len(cs.changed)}</span>
 					<span class="added" title="${_('added')}">${len(cs.added)}</span>
 				</div>
 					<div class="right">
 						%if len(cs.parents)>1:
 						<div class="merge">
 						${_('merge')}
 						<img alt="merge" src="/images/icons/arrow_join.png">
 						</div>
 						%endif
 						%for p_cs in reversed(cs.parents):
 							<div class="parent">${_('Parrent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,
 					h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),
 					title=p_cs.message)}</div>
 						%endfor
 					</div>
 		</div>
 	%endfor

0 comments (0 inline, 0 general)