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

@@ @@ -431,96 +431,112 @@ canvas { @@
 #graph_content .container .wrapper{
 	width: 600px;
+}
 #graph_content .container{
 	border-bottom: 1px solid #CCCCCC;
 	border-left: 1px solid #CCCCCC;
 	border-right: 1px solid #CCCCCC;
 	height:120px;
+}
 #graph_content .container .left{
 	float:left;
 	width: 70%;
 	padding-left: 5px;
+}
 #graph_content .container .right{
 	float:right;
 	width: 25%;
+}
 #graph_content .container .left .date{
 	font-weight:bold;
+}
 #graph_content .container .left .author{
+}
 #graph_content .container .left .message{
 	font-size: 80%;
+}
 .right .added,.changed,.removed{
 	border:1px solid #DDDDDD;
 	display:block;
 	float:right;
 	font-size:0.75em;
 	text-align:center;
 	min-width:15px;
+}
 .right .added{
 	background:#BBFFBB;
+}
 .right .changed{
 	background: #FFDD88;
+}
 .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 */
 div.browserblock {
     overflow: hidden;
     padding: 0px;
     border: 1px solid #ccc;
     background: #f8f8f8;
     font-size: 100%;
     line-height: 100%;
     /* new */
     line-height: 125%;
+}
 div.browserblock .browser-header{
 	border-bottom: 1px solid #CCCCCC;
 	background: #EEEEEE;
 	color:blue;
 	padding:10px 0 10px 0;
+}
 div.browserblock .browser-header span{
 	margin-left:25px;
 	font-weight: bold;
+}
 div.browserblock .browser-body{
 	background: #EEEEEE;
+}
 table.code-browser {
 	border-collapse:collapse;
 	width: 100%;
+}
 table.code-browser tr{
 	margin:3px;
+}
 table.code-browser thead th {
 	background-color: #EEEEEE;
 	height: 20px;
 	font-size: 1.1em;
 	font-weight: bold;
 	text-align: center;
 	text-align: left;
 	padding-left: 10px;
+}
 table.code-browser tbody tr {
+}

pylons_app/templates/changelog/changelog.html

➞

Show inline comments

 <%!
 from pylons_app.lib import filters
 %>
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Changelog - %s') % c.repo_name}
 </%def>
 <%def name="breadcrumbs()">
     ${h.link_to(u'Home',h.url('/'))}
+    /
     ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
+    /
     ${_('changelog')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('changelog')}
 </%def>
 <%def name="main()">
     <h2 class="no-link no-border">${_('Changelog')} - ${_('showing ')} ${c.size} ${_('revisions')}</h2>
 	<noscript>${_('The revision graph only works with JavaScript-enabled browsers.')}</noscript>
 <div id="graph">
 	##<div id="graph_nodes" style="height:1000px">
 	##	<canvas id="graph" width="160"></canvas>
 	##</div>
 	<div id="graph_content">
 		<div class="container_header">
 			${h.form(h.url.current(),method='get')}
 				${_('Show')}: ${h.text('size',size=5,value=c.size)} ${_('revisions')}
 				${h.submit('','set')}
 			${h.end_form()}
 		</div>
 	%for cnt,cs in enumerate(c.pagination):
 		<div class="container">
 			<div class="left">
 				<div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div>
 				<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">
 						<span class="branchtag">${cs.branch}</span>
 						%for tag in cs.tags:
 							<span class="tagtag">${tag}</span>
 						%endfor
 					</span>
 			</div>
 				<div class="right">
 					<span class="removed" title="${_('removed')}">${len(cs.removed)}</span>
 					<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
 	</div>
 </div>
 ##<script type="text/javascript" src="/js/graph2.js"></script>
 ##<script type="text/javascript" src="http://bitbucket-assets.s3.amazonaws.com/js/lib/bundle.160310Mar.js"></script>
 ##
 ##<script>
 ##<!-- hide script content
 ##
 ##var jsdata = ${c.jsdata|n};
 ##var r = new BranchRenderer();
 ##r.render(jsdata);
 ##// stop hiding script -->
 ##</script>
 <div>
 	<h2>${c.pagination.pager('$link_previous ~2~ $link_next')}</h2>
 </div>
 </%def>
@@ \ No newline at end of file @@

0 comments (0 inline, 0 general)