kallithea Changeset - 1dbe02063123

Changeset - 1dbe02063123

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-06-23 00:31:00
marcin@python-works.com

graph fixes.

3 files changed with 11 insertions and 6 deletions:

pylons_app/public/js/graph.js

pylons_app/templates/base/base.html

pylons_app/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

pylons_app/public/js/graph.js

➞

Show inline comments

@@ @@ -96,25 +96,26 @@ function BranchRenderer() { @@
 				if (end > this.max_column) {
 					this.max_column = end;
+				}
 				this.setColor(color, 0.0, 0.65);
 				y = row.offsetTop-rela.offsetTop+4;
 				x = pad-((this.cell[0] + this.box_size * start - 1) + this.bg_height-2);
 				this.ctx.beginPath();
 				this.ctx.moveTo(x, y);
 				y += row.clientHeight;
 				//i don't know why it's +1 just fixes some drawing graph.
 				y += row.clientHeight+1;
 				x = pad-((1 + this.box_size * end) + this.bg_height-2);
 				this.ctx.lineTo(x,y+extra);
 				this.ctx.stroke();
+			}
 			column = node[0]
 			color = node[1]
 			radius = 4;
 			y = row.offsetTop-rela.offsetTop+4;
 			x = pad-(Math.round(this.cell[0] * scale/2 * column + radius) + 15 - (column*4));

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -19,25 +19,25 @@ @@
     <div class="flash_msg">
     <% messages = h.flash.pop_messages() %>
 		% if messages:
 		<ul id="flash-messages">
 		    % for message in messages:
 		    <li class="${message.category}_msg">${message}</li>
 		    % endfor
 		</ul>
 		% endif
     </div>
     <div id="main">
     	${next.main()}
     	<script>${h.tooltip.activate()}</script>
+    	<script type="text/javascript">${h.tooltip.activate()}</script>
     </div>
     <div class="page-footer">
         Hg App ${c.hg_app_version} &copy; 2010 by Marcin Kuzminski
     </div>
     <div id="powered-by">
         <p>
         <a href="http://mercurial.selenic.com/" title="Mercurial">
             <img src="/images/hglogo.png" width="75" height="90" alt="mercurial"/></a>
         </p>
     </div>

pylons_app/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -21,53 +21,57 @@ @@
     	${_('out of')} ${c.total_cs} ${_('revisions')}
     </h2>
 	<noscript>${_('The revision graph only works with JavaScript-enabled browsers.')}</noscript>
 % 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')}
 				${_('Show')}: ${h.text('size',size=2,value=c.size)} ${_('revisions')}
 				${h.submit('','set')}
 			<div>
 				<span>${_('Show')}: </span>
 				<span>${h.text('size',size=2,value=c.size)}</span>
 				<span>${_('revisions')}</span>
 				${h.submit('set',_('set'))}
 			</div>
 			${h.end_form()}
 		</div>
 	%for cnt,cs in enumerate(c.pagination):
 		<div id="chg_${cnt+1}" 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">
 				<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>
 					<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">
 						<div class="changes">
 							<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>
 							%if len(cs.parents)>1:
 							<div class="merge">
 								${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png">
+								${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>
 							</div>
 							%endif
 						%for p_cs in reversed(cs.parents):
 							<div class="parent">${_('Parent')} ${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>

0 comments (0 inline, 0 general)