##// END OF EJS Templates
spelling fixes
marcink -
r271:0d809e72 default
parent child Browse files
Show More
@@ -1,92 +1,92 b''
1 <%!
1 <%!
2 from pylons_app.lib import filters
2 from pylons_app.lib import filters
3 %>
3 %>
4 <%inherit file="/base/base.html"/>
4 <%inherit file="/base/base.html"/>
5
5
6 <%def name="title()">
6 <%def name="title()">
7 ${_('Changelog - %s') % c.repo_name}
7 ${_('Changelog - %s') % c.repo_name}
8 </%def>
8 </%def>
9 <%def name="breadcrumbs()">
9 <%def name="breadcrumbs()">
10 ${h.link_to(u'Home',h.url('/'))}
10 ${h.link_to(u'Home',h.url('/'))}
11 /
11 /
12 ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
12 ${h.link_to(c.repo_name,h.url('changelog_home',repo_name=c.repo_name))}
13 /
13 /
14 ${_('changelog')}
14 ${_('changelog')}
15 </%def>
15 </%def>
16 <%def name="page_nav()">
16 <%def name="page_nav()">
17 ${self.menu('changelog')}
17 ${self.menu('changelog')}
18 </%def>
18 </%def>
19
19
20 <%def name="main()">
20 <%def name="main()">
21
21
22 <h2 class="no-link no-border">${_('Changelog')} - ${_('showing ')} ${c.size} ${_('revisions')}</h2>
22 <h2 class="no-link no-border">${_('Changelog')} - ${_('showing ')} ${c.size} ${_('revisions')}</h2>
23 <noscript>${_('The revision graph only works with JavaScript-enabled browsers.')}</noscript>
23 <noscript>${_('The revision graph only works with JavaScript-enabled browsers.')}</noscript>
24
24
25 <div id="graph">
25 <div id="graph">
26 ##<div id="graph_nodes" style="height:1000px">
26 ##<div id="graph_nodes" style="height:1000px">
27 ## <canvas id="graph" width="160"></canvas>
27 ## <canvas id="graph" width="160"></canvas>
28 ##</div>
28 ##</div>
29 <div id="graph_content">
29 <div id="graph_content">
30 <div class="container_header">
30 <div class="container_header">
31 ${h.form(h.url.current(),method='get')}
31 ${h.form(h.url.current(),method='get')}
32 ${_('Show')}: ${h.text('size',size=5,value=c.size)} ${_('revisions')}
32 ${_('Show')}: ${h.text('size',size=5,value=c.size)} ${_('revisions')}
33 ${h.submit('','set')}
33 ${h.submit('','set')}
34 ${h.end_form()}
34 ${h.end_form()}
35 </div>
35 </div>
36 %for cnt,cs in enumerate(c.pagination):
36 %for cnt,cs in enumerate(c.pagination):
37 <div class="container">
37 <div class="container">
38 <div class="left">
38 <div class="left">
39 <div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div>
39 <div class="date">${_('commit')} ${cs.revision}: ${cs.raw_id}@${cs.date}</div>
40 <div class="author">${cs.author}</div>
40 <div class="author">${cs.author}</div>
41 <div id="chg_${cnt}" class="message">
41 <div id="chg_${cnt}" class="message">
42 ${h.link_to(cs.message,
42 ${h.link_to(cs.message,
43 h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),
43 h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id),
44 title=cs.message)}
44 title=cs.message)}
45 </div>
45 </div>
46 <span class="logtags">
46 <span class="logtags">
47 <span class="branchtag">${cs.branch}</span>
47 <span class="branchtag">${cs.branch}</span>
48 %for tag in cs.tags:
48 %for tag in cs.tags:
49 <span class="tagtag">${tag}</span>
49 <span class="tagtag">${tag}</span>
50 %endfor
50 %endfor
51 </span>
51 </span>
52 </div>
52 </div>
53 <div class="right">
53 <div class="right">
54 <div class="changes">
54 <div class="changes">
55 <span class="removed" title="${_('removed')}">${len(cs.removed)}</span>
55 <span class="removed" title="${_('removed')}">${len(cs.removed)}</span>
56 <span class="changed" title="${_('changed')}">${len(cs.changed)}</span>
56 <span class="changed" title="${_('changed')}">${len(cs.changed)}</span>
57 <span class="added" title="${_('added')}">${len(cs.added)}</span>
57 <span class="added" title="${_('added')}">${len(cs.added)}</span>
58 </div>
58 </div>
59 %if len(cs.parents)>1:
59 %if len(cs.parents)>1:
60 <div class="merge">
60 <div class="merge">
61 ${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png">
61 ${_('merge')}<img alt="merge" src="/images/icons/arrow_join.png">
62 </div>
62 </div>
63 %endif
63 %endif
64 %for p_cs in reversed(cs.parents):
64 %for p_cs in reversed(cs.parents):
65 <div class="parent">${_('Parrent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,
65 <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,
66 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
66 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
67 </div>
67 </div>
68 %endfor
68 %endfor
69 </div>
69 </div>
70 </div>
70 </div>
71
71
72 %endfor
72 %endfor
73 </div>
73 </div>
74 </div>
74 </div>
75
75
76 ##<script type="text/javascript" src="/js/graph2.js"></script>
76 ##<script type="text/javascript" src="/js/graph2.js"></script>
77 ##<script type="text/javascript" src="http://bitbucket-assets.s3.amazonaws.com/js/lib/bundle.160310Mar.js"></script>
77 ##<script type="text/javascript" src="http://bitbucket-assets.s3.amazonaws.com/js/lib/bundle.160310Mar.js"></script>
78 ##
78 ##
79 ##<script>
79 ##<script>
80 ##<!-- hide script content
80 ##<!-- hide script content
81 ##
81 ##
82 ##var jsdata = ${c.jsdata|n};
82 ##var jsdata = ${c.jsdata|n};
83 ##var r = new BranchRenderer();
83 ##var r = new BranchRenderer();
84 ##r.render(jsdata);
84 ##r.render(jsdata);
85
85
86 ##// stop hiding script -->
86 ##// stop hiding script -->
87 ##</script>
87 ##</script>
88
88
89 <div>
89 <div>
90 <h2>${c.pagination.pager('$link_previous ~2~ $link_next')}</h2>
90 <h2>${c.pagination.pager('$link_previous ~2~ $link_next')}</h2>
91 </div>
91 </div>
92 </%def> No newline at end of file
92 </%def>
@@ -1,94 +1,94 b''
1 <%!
1 <%!
2 from pylons_app.lib import filters
2 from pylons_app.lib import filters
3 %>
3 %>
4 <%inherit file="/base/base.html"/>
4 <%inherit file="/base/base.html"/>
5
5
6 <%def name="title()">
6 <%def name="title()">
7 ${_('Changeset')}
7 ${_('Changeset')}
8 </%def>
8 </%def>
9 <%def name="breadcrumbs()">
9 <%def name="breadcrumbs()">
10 ${h.link_to(u'Home',h.url('/'))}
10 ${h.link_to(u'Home',h.url('/'))}
11 /
11 /
12 ${h.link_to(c.repo_name,h.url('changeset_home',repo_name=c.repo_name))}
12 ${h.link_to(c.repo_name,h.url('changeset_home',repo_name=c.repo_name))}
13 /
13 /
14 ${_('changeset')}
14 ${_('changeset')}
15 </%def>
15 </%def>
16 <%def name="page_nav()">
16 <%def name="page_nav()">
17 ${self.menu('changelog')}
17 ${self.menu('changelog')}
18 </%def>
18 </%def>
19 <%def name="css()">
19 <%def name="css()">
20 <link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" />
20 <link rel="stylesheet" href="/css/monoblue_custom.css" type="text/css" />
21 <link rel="stylesheet" href="/css/diff.css" type="text/css" />
21 <link rel="stylesheet" href="/css/diff.css" type="text/css" />
22 </%def>
22 </%def>
23 <%def name="main()">
23 <%def name="main()">
24 <h2 class="no-link no-border">${_('Changeset')} - r${c.changeset.revision}:${c.changeset.raw_id}</h2>
24 <h2 class="no-link no-border">${_('Changeset')} - r${c.changeset.revision}:${c.changeset.raw_id}</h2>
25
25
26 <div id="changeset_content">
26 <div id="changeset_content">
27 <div class="container">
27 <div class="container">
28 <div class="left">
28 <div class="left">
29 <div class="date">${_('Date')}: ${c.changeset.date}</div>
29 <div class="date">${_('Date')}: ${c.changeset.date}</div>
30 <div class="author">${_('Author')}: ${c.changeset.author}</div>
30 <div class="author">${_('Author')}: ${c.changeset.author}</div>
31 <div class="message">
31 <div class="message">
32 ${c.changeset.message}
32 ${c.changeset.message}
33 </div>
33 </div>
34 </div>
34 </div>
35 <div class="right">
35 <div class="right">
36 <span class="logtags">
36 <span class="logtags">
37 <span class="branchtag">${c.changeset.branch}</span>
37 <span class="branchtag">${c.changeset.branch}</span>
38 %for tag in c.changeset.tags:
38 %for tag in c.changeset.tags:
39 <span class="tagtag">${tag}</span>
39 <span class="tagtag">${tag}</span>
40 %endfor
40 %endfor
41 </span>
41 </span>
42 %if len(c.changeset.parents)>1:
42 %if len(c.changeset.parents)>1:
43 <div class="merge">
43 <div class="merge">
44 ${_('merge')}
44 ${_('merge')}
45 <img alt="merge" src="/images/icons/arrow_join.png">
45 <img alt="merge" src="/images/icons/arrow_join.png">
46 </div>
46 </div>
47 %endif
47 %endif
48 %for p_cs in reversed(c.changeset.parents):
48 %for p_cs in reversed(c.changeset.parents):
49 <div class="parent">${_('Parrent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,
49 <div class="parent">${_('Parent')} ${p_cs.revision}: ${h.link_to(p_cs.raw_id,
50 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
50 h.url('changeset_home',repo_name=c.repo_name,revision=p_cs.raw_id),title=p_cs.message)}
51 </div>
51 </div>
52 %endfor
52 %endfor
53 </div>
53 </div>
54 </div>
54 </div>
55 </div>
55 </div>
56
56
57 <div style="clear:both;height:10px"></div>
57 <div style="clear:both;height:10px"></div>
58 <div class="cs_files">
58 <div class="cs_files">
59 %for change,filenode,diff in c.changes:
59 %for change,filenode,diff in c.changes:
60 <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div>
60 <div class="cs_${change}">${h.link_to(filenode.path,h.url.current(anchor='CHANGE-%s'%filenode.path))}</div>
61 %endfor
61 %endfor
62 </div>
62 </div>
63
63
64 %for change,filenode,diff in c.changes:
64 %for change,filenode,diff in c.changes:
65 %if change !='removed':
65 %if change !='removed':
66 <div style="clear:both;height:10px"></div>
66 <div style="clear:both;height:10px"></div>
67 <div id="body" class="diffblock">
67 <div id="body" class="diffblock">
68 <div id="${'CHANGE-%s'%filenode.path}" class="code-header">
68 <div id="${'CHANGE-%s'%filenode.path}" class="code-header">
69 <div>
69 <div>
70 <span>
70 <span>
71 ${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name,
71 ${h.link_to_if(change!='removed',filenode.path,h.url('files_home',repo_name=c.repo_name,
72 revision=filenode.changeset.raw_id,f_path=filenode.path))}
72 revision=filenode.changeset.raw_id,f_path=filenode.path))}
73 </span>
73 </span>
74
74
75 ##&raquo; <span style="font-size:77%">${h.link_to(_('diff'),
75 ##&raquo; <span style="font-size:77%">${h.link_to(_('diff'),
76 ##h.url.current(diff2=c.diff2,diff1=c.diff1,diff='diff'))}</span>
76 ##h.url.current(diff2=c.diff2,diff1=c.diff1,diff='diff'))}</span>
77 ##&raquo; <span style="font-size:77%">${h.link_to(_('raw diff'),
77 ##&raquo; <span style="font-size:77%">${h.link_to(_('raw diff'),
78 ##h.url.current(diff2=c.diff2,diff1=c.diff1.split(':')[-1],diff='raw'))}</span>
78 ##h.url.current(diff2=c.diff2,diff1=c.diff1.split(':')[-1],diff='raw'))}</span>
79 ##&raquo; <span style="font-size:77%">${h.link_to(_('download diff'),
79 ##&raquo; <span style="font-size:77%">${h.link_to(_('download diff'),
80 ##h.url.current(diff2=c.diff2,diff1=c.diff1,diff='download'))}</span>
80 ##h.url.current(diff2=c.diff2,diff1=c.diff1,diff='download'))}</span>
81 </div>
81 </div>
82 </div>
82 </div>
83 <div class="code-body">
83 <div class="code-body">
84 %if diff:
84 %if diff:
85 ${diff|n}
85 ${diff|n}
86 %else:
86 %else:
87 ${_('No changes in this file')}
87 ${_('No changes in this file')}
88 %endif
88 %endif
89 </div>
89 </div>
90 </div>
90 </div>
91 %endif
91 %endif
92 %endfor
92 %endfor
93
93
94 </%def> No newline at end of file
94 </%def>
General Comments 0
You need to be logged in to leave comments. Login now