kallithea Changeset - c8798599cf8d

Changeset - c8798599cf8d

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Marcin Kuzminski - 15 years ago 2010-10-05 01:58:53
marcin@python-works.com

fixed displaying multi line commit messages,
some templating updates

3 files changed with 7 insertions and 10 deletions:

pylons_app/public/css/style.css

pylons_app/templates/changelog/changelog.html

pylons_app/templates/changeset/changeset.html

0 comments (0 inline, 0 general)

pylons_app/public/css/style.css

➞

Show inline comments

@@ @@ -3015,218 +3015,221 @@ div.form div.fields div.buttons input @@
 	margin-left: 5px;
+}
 #clone_url{
 	border: none;
+}
 /* -----------------------------------------------------------
     FILES
 ----------------------------------------------------------- */
 h3.files_location{
     font-size: 1.8em;
     font-weight: bold;
     margin: 10px 0 !important;
     border-bottom: none !important;
+}
 #files_data.dl{
+}
 #files_data dl dt{
     float:left;
     margin:0 !important;
     padding:5px;
     width:115px;
+}
 #files_data dl dd{
     margin:0 !important;
     padding: 5px !important;
+}
 /* -----------------------------------------------------------
 	CHANGESETS
 ----------------------------------------------------------- */
 #changeset_content {
 	border:1px solid #CCCCCC;
 	padding:5px;
+}
 #changeset_content .container .wrapper {
 	width: 600px;
+}
 #changeset_content .container {
 	min-height: 120px;
 	font-size: 1.2em;
+	overflow: hidden;
+}
 #changeset_content .container .left {
 	float: left;
 	width: 70%;
 	padding-left: 5px;
+}
 #changeset_content .container .right {
 	float: right;
 	width: 25%;
 	text-align: right;
+}
 #changeset_content .container .left .date {
 	font-weight: bold;
+}
 #changeset_content .container .left .author {
+}
 #changeset_content .container .left .message {
 	font-style: italic;
 	color: #556CB5;
 	white-space: pre-wrap;
+}
 .cs_files {
+}
 .cs_files .cs_added {
 	background: url("/images/icons/page_white_add.png") no-repeat scroll 3px;
 	/*background-color:#BBFFBB;*/
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 .cs_files .cs_changed {
 	background: url("/images/icons/page_white_edit.png") no-repeat scroll
 px;
 	/*background-color: #FFDD88;*/
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 .cs_files .cs_removed {
 	background: url("/images/icons/page_white_delete.png") no-repeat scroll
 px;
 	/*background-color: #FF8888;*/
 	height: 16px;
 	padding-left: 20px;
 	margin-top: 7px;
 	text-align: left;
+}
 /* -----------------------------------------------------------
 	CHANGESETS - CANVAS
 ----------------------------------------------------------- */
 #graph {
 	overflow: hidden;
+}
 #graph_nodes {
 	width: 160px;
 	float: left;
 	margin-left:-50px;
 	margin-top: 5px;
+}
 #graph_content {
 	width: 800px;
 	float: left;
+}
 #graph_content .container_header {
 	border: 1px solid #CCCCCC;
 	padding:10px;
+}
 #graph_content .container .wrapper {
 	width: 600px;
+}
 #graph_content .container {
 	border-bottom: 1px solid #CCCCCC;
 	border-left: 1px solid #CCCCCC;
 	border-right: 1px solid #CCCCCC;
 	min-height: 80px;
 	overflow: hidden;
 	font-size:1.2em;
+}
 #graph_content .container .left {
 	float: left;
 	width: 70%;
 	padding-left: 5px;
+}
 #graph_content .container .right {
 	float: right;
-	width: 25%;
+	width: 28%;
 	text-align: right;
 	padding-bottom: 5px;
+}
 #graph_content .container .left .date {
 	font-weight: bold;
+}
 #graph_content .container .left .author {
+}
 #graph_content .container .left .message {
 	font-size: 100%;
 	padding-top: 3px;
 	white-space: pre-wrap;
+}
 .right div {
 	clear: both;
+}
 .right .changes .added,.changed,.removed {
 	border: 1px solid #DDDDDD;
 	display: block;
 	float: right;
 	text-align: center;
 	min-width: 15px;
+}
 .right .changes .added {
 	background: #BBFFBB;
+}
 .right .changes .changed {
 	background: #FFDD88;
+}
 .right .changes .removed {
 	background: #FF8888;
+}
 .right .merge {
 	vertical-align: top;
 	font-size: 60%;
 	font-weight: bold;
+}
 .right .merge img {
 	vertical-align: bottom;
+}
 .right .parent {
 	font-size: 90%;
 	font-family: monospace;
+}
 .right .logtags .branchtag{
 	background: #FFFFFF url("../images/icons/arrow_branch.png") no-repeat right 6px;
     display:block;
     padding:8px 16px 0px 0px
+}
 .right .logtags .tagtag{
     background: #FFFFFF url("../images/icons/tag_blue.png") no-repeat right 6px;

pylons_app/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -9,100 +9,97 @@ @@
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('Changelog')} - ${_('showing ')} ${c.size if c.size <= c.total_cs else c.total_cs} ${_('out of')} ${c.total_cs} ${_('revisions')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('changelog')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
 		% 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')}
         <div class="info_box">
           <span>${_('Show')}:</span>
           ${h.text('size',size=1,value=c.size)}
           <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.short_id}@${cs.date}</div>
 							<div class="author">
 								<div class="gravatar">
 									<img alt="gravatar" src="${h.gravatar_url(h.email(cs.author),20)}"/>
 								</div>
 								<span>${h.person(cs.author)}</span><br/>
 								<span><a href="mailto:${h.email_or_none(cs.author)}">${h.email_or_none(cs.author)}</a></span><br/>
 							</div>
 							<div class="message">
 								${h.link_to(h.wrap_paragraphs(cs.message),
 								h.url('changeset_home',repo_name=c.repo_name,revision=cs.short_id))}
 							</div>
 							<div class="message">${h.link_to(h.wrap_paragraphs(cs.message),h.url('changeset_home',repo_name=c.repo_name,revision=cs.short_id))}</div>
 						</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"/>
 										</div>
 										%endif
 									%for p_cs in reversed(cs.parents):
 										<div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.short_id,
 											h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.short_id),title=p_cs.message)}
 										</div>
 									%endfor
 								<span class="logtags">
 									<span class="branchtag" title="${'%s %s' % (_('branch'),cs.branch)}">
 									${h.link_to(cs.branch,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span>
 									%for tag in cs.tags:
 										<span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 										${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=cs.short_id))}</span>
 									%endfor
 								</span>
 						</div>
 					</div>
 				%endfor
 				<div class="pagination-wh pagination-left">
 					${c.pagination.pager('$link_previous ~2~ $link_next')}
 				</div>
 				</div>
 			</div>
 			<script type="text/javascript" src="/js/graph.js"></script>
 			<script type="text/javascript">
 				YAHOO.util.Event.onDOMReady(function(){
 					function set_canvas() {
 						var c = document.getElementById('graph_nodes');
 						var t = document.getElementById('graph_content');
 						canvas = document.getElementById('graph_canvas');
 						var div_h = t.clientHeight;
 						c.style.height=div_h+'px';
 						canvas.setAttribute('height',div_h);
 						canvas.setAttribute('width',160);
 					};
 					set_canvas();

pylons_app/templates/changeset/changeset.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id} - ${c.repo_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id}
 </%def>
 <%def name="page_nav()">
     ${self.menu('changelog')}
 </%def>
 <%def name="main()">
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
 		<div id="body" class="diffblock">
 			<div class="code-header">
 				<div>
 				${_('Changeset')} - r${c.changeset.revision}:${c.changeset.short_id}
 				 &raquo; <span>${h.link_to(_('raw diff'),
 				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id,diff='show'))}</span>
 				 &raquo; <span>${h.link_to(_('download diff'),
 				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id,diff='download'))}</span>
 				</div>
 			</div>
 		</div>
 	    <div id="changeset_content">
 			<div class="container">
 	             <div class="left">
 	                 <div class="date">${_('commit')} ${c.changeset.revision}: ${c.changeset.short_id}@${c.changeset.date}</div>
 	                 <div class="author">
 	                     <div class="gravatar">
 	                         <img alt="gravatar" src="${h.gravatar_url(h.email(c.changeset.author),20)}"/>
 	                     </div>
 	                     <span>${h.person(c.changeset.author)}</span><br/>
 	                     <span><a href="mailto:${h.email_or_none(c.changeset.author)}">${h.email_or_none(c.changeset.author)}</a></span><br/>
 	                 </div>
 	                 <div class="message">
 	                     ${h.link_to(h.wrap_paragraphs(c.changeset.message),
 	                     h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id))}
 	                 </div>
 	                 <div class="message">${h.link_to(h.wrap_paragraphs(c.changeset.message),h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</div>
 	             </div>
 	             <div class="right">
 		             <div class="changes">
 		                 <span class="removed" title="${_('removed')}">${len(c.changeset.removed)}</span>
 		                 <span class="changed" title="${_('changed')}">${len(c.changeset.changed)}</span>
 		                 <span class="added" title="${_('added')}">${len(c.changeset.added)}</span>
 		             </div>
 		                 %if len(c.changeset.parents)>1:
 		                 <div class="merge">
 		                     ${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png"/>
 		                 </div>
 		                 %endif
 		             %for p_cs in reversed(c.changeset.parents):
 		                 <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.short_id,
 		                     h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.short_id),title=p_cs.message)}
 		                 </div>
 		             %endfor
 		         <span class="logtags">
 		             <span class="branchtag" title="${'%s %s' % (_('branch'),c.changeset.branch)}">
 		             ${h.link_to(c.changeset.branch,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</span>
 		             %for tag in c.changeset.tags:
 		                 <span class="tagtag"  title="${'%s %s' % (_('tag'),tag)}">
 		                 ${h.link_to(tag,h.url('files_home',repo_name=c.repo_name,revision=c.changeset.short_id))}</span>
 		             %endfor
 		         </span>
 	                </div>
 	        </div>
 	        <span style="font-size:1.1em;font-weight: bold">${_('Files affected')}</span>
 	        <div class="cs_files">
 	                %for change,filenode,diff,cs1,cs2 in c.changes:
 	                    <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div>
 	                %endfor
 	        </div>
 	    </div>
     </div>
 	%for change,filenode,diff,cs1,cs2 in c.changes:
 		%if change !='removed':
 		<div style="clear:both;height:10px"></div>
 		<div id="body" class="diffblock">
 			<div id="${'CHANGE-%s'%filenode.path}" class="code-header">
 				<div>
 					<span>
 						${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name,
 						revision=filenode.changeset.short_id,f_path=filenode.path))}
 					</span>
 					%if 1:

0 comments (0 inline, 0 general)