kallithea Changeset - 787689980bcd

Changeset - 787689980bcd

Parent rev.

Child rev.

[Not reviewed]

default

1 2 1

Marcin Kuzminski - 16 years ago 2010-05-09 17:23:11
marcin@python-works.com

Tempaltes changes for changelog and shortlog, changed menu generation in base

4 files changed with 133 insertions and 145 deletions:

pylons_app/templates/base/base.html

pylons_app/templates/changelog/changelog.html

115

pylons_app/templates/graph.html

112

pylons_app/templates/shortlog/shortlog.html

0 comments (0 inline, 0 general)

pylons_app/templates/base/base.html

➞

Show inline comments

 ## -*- coding: utf-8 -*-
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
 <head>
     <link rel="icon" href="/images/hgicon.png" type="image/png" />
     <meta name="robots" content="index, nofollow"/>
     <title>${next.title()}</title>
     ##<link rel="stylesheet" href="/js/yui/reset-fonts-grids/reset-fonts-grids.css" type="text/css" />
     ${self.css()}
     ${self.js()}
 </head>
 <body>
+<body class="mainbody">
 <div id="container">
     <div class="page-header">
         <h1>
             ${next.breadcrumbs()}
         </h1>
         <ul class="page-nav">
@@ @@ -80,42 +81,26 @@ @@
 					%for repo in c.repo_list:
 						<option value="${repo}">${repo}</option>
 					%endfor
 					</select>
 				</div>
 			</li>
             <li
             %if current=='summary':
             	class='current'
             %endif
             >${h.link_to_unless(current=='summary',_('summary'),h.url('summary_home',repo_name=c.repo_name))}</li>
             <li
             %if current=='changelog':
             	class='current'
             %endif
             >${h.link_to_unless(current=='changelog',_('changelog'),h.url('changelog_home',repo_name=c.repo_name))}</li>
             <li
             %if current=='branches':
             	class='current'
             %endif
             >${h.link_to_unless(current=='branches',_('branches'),h.url('branches_home',repo_name=c.repo_name))}</li>
             <li
             %if current=='tags':
             	class='current'
             %endif
             >${h.link_to_unless(current=='tags',_('tags'),h.url('tags_home',repo_name=c.repo_name))}</li>
             <li
             %if current=='graph':
             	class='current'
             %endif
             >${h.link_to_unless(current=='graph',_('graph'),h.url('graph_home',repo_name=c.repo_name))}</li>
             <li
             %if current=='files':
             	class='current'
             %endif
             >${h.link_to_unless(current=='files',_('files'),h.url('files_home',repo_name=c.repo_name))}</li>
 			<%def name="is_current(selected)">
 				<%
 				if selected == current:
 					return 'current'
 				else:
 					return ''
 				%>
 			</%def>
             <li class="${is_current('summary')}">${h.link_to(_('summary'),h.url('summary_home',repo_name=c.repo_name))}</li>
             <li class="${is_current('shortlog')}">${h.link_to(_('shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}</li>
 			<li class="${is_current('changelog')}">${h.link_to(_('changelog'),h.url('changelog_home',repo_name=c.repo_name))}</li>
             <li class="${is_current('branches')}">${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name))}</li>
             <li class="${is_current('tags')}">${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name))}</li>
             <li class="${is_current('files')}">${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name))}</li>
         </ul>
 </%def>
 <%def name="css()">
 <link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" />
 </%def>

pylons_app/templates/changelog/changelog.html

➞

Show inline comments

@@ new file 100644 @@
 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${_('Repository managment')}
 </%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()">
         <form action="log">
             <dl class="search">
                 <dt><label>Search: </label></dt>
                 <dd><input type="text" name="rev" /></dd>
             </dl>
         </form>
 		${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>
 ${h.form(h.url.current(),method='get')}
 	${_('Show')}: ${h.text('size',size=5,value=c.size)} ${_('revisions')}
 	${h.submit('','set')}
 ${h.end_form()}
 </div>
 <div id="wrapper"  style="height:${c.canvasheight}px">
 	<div style="float:left;height:${c.canvasheight}px">
 		<canvas id="graph" width="224" height="${c.canvasheight}"></canvas>
 	</div>
 	<div style="float:left;height:${c.canvasheight}px">
 		<ul id="graphnodes"></ul>
 	</div>
 </div>
 <script type="text/javascript" src="/js/graph.js"></script>
 <script>
 <!-- hide script content
 var data = ${c.jsdata|n};
 var graph = new Graph();
 graph.scale(39);
 graph.edge = function(x0, y0, x1, y1, color) {
 	this.setColor(color, 0.0, 0.65);
 	this.ctx.beginPath();
 	this.ctx.moveTo(x0, y0);
 	this.ctx.lineTo(x1, y1);
 	this.ctx.stroke();
+}
 var revlink = '<li style="_STYLE"><span class="desc">';
 revlink += '<a class="list" href="/${c.repo_name}/changeset/_NODEID" title="_NODEID"><b>_DESC</b></a>';
 revlink += '</span> _TAGS';
 revlink += '<span class="info">_DATE, by _USER</span></li>';
 graph.vertex = function(x, y, color, parity, cur) {
 	this.ctx.beginPath();
 	color = this.setColor(color, 0.25, 0.75);
 	this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
 	this.ctx.fill();
 	var bg = '<li class="bg parity' + parity + '"></li>';
 	var left = (this.columns + 1) * this.bg_height;
 	var nstyle = 'padding-left: ' + left + 'px;';
 	var item = revlink.replace(/_STYLE/, nstyle);
 	item = item.replace(/_PARITY/, 'parity' + parity);
 	item = item.replace(/_NODEID/, cur[0]);
 	item = item.replace(/_NODEID/, cur[0]);
 	item = item.replace(/_DESC/, cur[3]);
 	item = item.replace(/_USER/, cur[4]);
 	item = item.replace(/_DATE/, cur[5]);
 	var tagspan = '';
 	if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
 		tagspan = '<span class="logtags">';
 		if (cur[6][1]) {
 			tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
 			tagspan += cur[6][0] + '</span> ';
 		} else if (!cur[6][1] && cur[6][0] != 'default') {
 			tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
 			tagspan += cur[6][0] + '</span> ';
+		}
 		if (cur[7].length) {
 			for (var t in cur[7]) {
 				var tag = cur[7][t];
 				tagspan += '<span class="tagtag">' + tag + '</span> ';
+			}
+		}
 		tagspan += '</span>';
+	}
 	item = item.replace(/_TAGS/, tagspan);
 	return [bg, item];
+}
 graph.render(data);
 // stop hiding script -->
 </script>
 <div>
 	<h2>${c.pagination.pager('$link_previous ~2~ $link_next')}</h2>
 </div>
 </%def>
@@ \ No newline at end of file @@

pylons_app/templates/graph.html

➞

Show inline comments

deleted file

pylons_app/templates/shortlog/shortlog.html

➞

Show inline comments

@@ @@ -15,13 +15,13 @@ @@
             <dl class="search">
                 <dt><label>Search: </label></dt>
                 <dd><input type="text" name="rev" /></dd>
             </dl>
         </form>
-		${self.menu('changelog')}
+		${self.menu('shortlog')}
 </%def>
 <%def name="main()">
     <h2 class="no-link no-border">${_('Shortlog')}</h2>
 	<div id="shortlog_data">

0 comments (0 inline, 0 general)