##// END OF EJS Templates
Tempaltes changes for changelog and shortlog, changed menu generation in base
marcink -
r143:78768998 default
parent child Browse files
Show More
@@ -0,0 +1,115 b''
1 <%inherit file="/base/base.html"/>
2
3 <%def name="title()">
4 ${_('Repository managment')}
5 </%def>
6 <%def name="breadcrumbs()">
7 ${h.link_to(u'Home',h.url('/'))}
8 /
9 ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
10 /
11 ${_('changelog')}
12 </%def>
13 <%def name="page_nav()">
14 <form action="log">
15 <dl class="search">
16 <dt><label>Search: </label></dt>
17 <dd><input type="text" name="rev" /></dd>
18 </dl>
19 </form>
20
21 ${self.menu('changelog')}
22 </%def>
23
24 <%def name="main()">
25
26 <h2 class="no-link no-border">${_('Changelog')} - ${_('showing ')} ${c.size} ${_('revisions')}</h2>
27 <noscript>${_('The revision graph only works with JavaScript-enabled browsers.')}</noscript>
28 <div>
29 ${h.form(h.url.current(),method='get')}
30 ${_('Show')}: ${h.text('size',size=5,value=c.size)} ${_('revisions')}
31 ${h.submit('','set')}
32 ${h.end_form()}
33 </div>
34 <div id="wrapper" style="height:${c.canvasheight}px">
35 <div style="float:left;height:${c.canvasheight}px">
36 <canvas id="graph" width="224" height="${c.canvasheight}"></canvas>
37 </div>
38 <div style="float:left;height:${c.canvasheight}px">
39 <ul id="graphnodes"></ul>
40 </div>
41 </div>
42
43 <script type="text/javascript" src="/js/graph.js"></script>
44 <script>
45 <!-- hide script content
46
47 var data = ${c.jsdata|n};
48 var graph = new Graph();
49 graph.scale(39);
50
51 graph.edge = function(x0, y0, x1, y1, color) {
52
53 this.setColor(color, 0.0, 0.65);
54 this.ctx.beginPath();
55 this.ctx.moveTo(x0, y0);
56 this.ctx.lineTo(x1, y1);
57 this.ctx.stroke();
58
59 }
60
61 var revlink = '<li style="_STYLE"><span class="desc">';
62 revlink += '<a class="list" href="/${c.repo_name}/changeset/_NODEID" title="_NODEID"><b>_DESC</b></a>';
63 revlink += '</span> _TAGS';
64 revlink += '<span class="info">_DATE, by _USER</span></li>';
65
66 graph.vertex = function(x, y, color, parity, cur) {
67
68 this.ctx.beginPath();
69 color = this.setColor(color, 0.25, 0.75);
70 this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
71 this.ctx.fill();
72
73 var bg = '<li class="bg parity' + parity + '"></li>';
74 var left = (this.columns + 1) * this.bg_height;
75 var nstyle = 'padding-left: ' + left + 'px;';
76 var item = revlink.replace(/_STYLE/, nstyle);
77 item = item.replace(/_PARITY/, 'parity' + parity);
78 item = item.replace(/_NODEID/, cur[0]);
79 item = item.replace(/_NODEID/, cur[0]);
80 item = item.replace(/_DESC/, cur[3]);
81 item = item.replace(/_USER/, cur[4]);
82 item = item.replace(/_DATE/, cur[5]);
83
84 var tagspan = '';
85 if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
86 tagspan = '<span class="logtags">';
87 if (cur[6][1]) {
88 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
89 tagspan += cur[6][0] + '</span> ';
90 } else if (!cur[6][1] && cur[6][0] != 'default') {
91 tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
92 tagspan += cur[6][0] + '</span> ';
93 }
94 if (cur[7].length) {
95 for (var t in cur[7]) {
96 var tag = cur[7][t];
97 tagspan += '<span class="tagtag">' + tag + '</span> ';
98 }
99 }
100 tagspan += '</span>';
101 }
102
103 item = item.replace(/_TAGS/, tagspan);
104 return [bg, item];
105
106 }
107
108 graph.render(data);
109
110 // stop hiding script -->
111 </script>
112 <div>
113 <h2>${c.pagination.pager('$link_previous ~2~ $link_next')}</h2>
114 </div>
115 </%def> No newline at end of file
@@ -1,15 +1,16 b''
1 ## -*- coding: utf-8 -*-
1 ## -*- coding: utf-8 -*-
2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml">
3 <html xmlns="http://www.w3.org/1999/xhtml" id="mainhtml">
4 <head>
4 <head>
5 <link rel="icon" href="/images/hgicon.png" type="image/png" />
5 <link rel="icon" href="/images/hgicon.png" type="image/png" />
6 <meta name="robots" content="index, nofollow"/>
6 <meta name="robots" content="index, nofollow"/>
7 <title>${next.title()}</title>
7 <title>${next.title()}</title>
8 ##<link rel="stylesheet" href="/js/yui/reset-fonts-grids/reset-fonts-grids.css" type="text/css" />
8 ${self.css()}
9 ${self.css()}
9 ${self.js()}
10 ${self.js()}
10 </head>
11 </head>
11
12
12 <body>
13 <body class="mainbody">
13 <div id="container">
14 <div id="container">
14 <div class="page-header">
15 <div class="page-header">
15 <h1>
16 <h1>
@@ -83,36 +84,20 b''
83 </select>
84 </select>
84 </div>
85 </div>
85 </li>
86 </li>
86 <li
87 <%def name="is_current(selected)">
87 %if current=='summary':
88 <%
88 class='current'
89 if selected == current:
89 %endif
90 return 'current'
90 >${h.link_to_unless(current=='summary',_('summary'),h.url('summary_home',repo_name=c.repo_name))}</li>
91 else:
91 <li
92 return ''
92 %if current=='changelog':
93 %>
93 class='current'
94 </%def>
94 %endif
95 <li class="${is_current('summary')}">${h.link_to(_('summary'),h.url('summary_home',repo_name=c.repo_name))}</li>
95 >${h.link_to_unless(current=='changelog',_('changelog'),h.url('changelog_home',repo_name=c.repo_name))}</li>
96 <li class="${is_current('shortlog')}">${h.link_to(_('shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}</li>
96 <li
97 <li class="${is_current('changelog')}">${h.link_to(_('changelog'),h.url('changelog_home',repo_name=c.repo_name))}</li>
97 %if current=='branches':
98 <li class="${is_current('branches')}">${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name))}</li>
98 class='current'
99 <li class="${is_current('tags')}">${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name))}</li>
99 %endif
100 <li class="${is_current('files')}">${h.link_to(_('files'),h.url('files_home',repo_name=c.repo_name))}</li>
100 >${h.link_to_unless(current=='branches',_('branches'),h.url('branches_home',repo_name=c.repo_name))}</li>
101 <li
102 %if current=='tags':
103 class='current'
104 %endif
105 >${h.link_to_unless(current=='tags',_('tags'),h.url('tags_home',repo_name=c.repo_name))}</li>
106 <li
107 %if current=='graph':
108 class='current'
109 %endif
110 >${h.link_to_unless(current=='graph',_('graph'),h.url('graph_home',repo_name=c.repo_name))}</li>
111 <li
112 %if current=='files':
113 class='current'
114 %endif
115 >${h.link_to_unless(current=='files',_('files'),h.url('files_home',repo_name=c.repo_name))}</li>
116 </ul>
101 </ul>
117 </%def>
102 </%def>
118
103
@@ -18,7 +18,7 b''
18 </dl>
18 </dl>
19 </form>
19 </form>
20
20
21 ${self.menu('changelog')}
21 ${self.menu('shortlog')}
22 </%def>
22 </%def>
23 <%def name="main()">
23 <%def name="main()">
24
24
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now