##// END OF EJS Templates
removed shortlog from main menu, as duplicated functionality of changelog,...
marcink -
r637:b04d5214 beta
parent child Browse files
Show More
@@ -53,7 +53,12 b' class SummaryController(BaseController):'
53 def index(self):
53 def index(self):
54 hg_model = HgModel()
54 hg_model = HgModel()
55 c.repo_info = hg_model.get_repo(c.repo_name)
55 c.repo_info = hg_model.get_repo(c.repo_name)
56 c.repo_changesets = Page(list(c.repo_info[:10]), page=1, items_per_page=20)
56 def url_generator(**kw):
57 return url('shortlog_home', repo_name=c.repo_name, **kw)
58
59 c.repo_changesets = Page(c.repo_info, page=1, items_per_page=10,
60 url=url_generator)
61
57 e = request.environ
62 e = request.environ
58
63
59 uri = u'%(protocol)s://%(user)s@%(host)s%(prefix)s/%(repo_name)s' % {
64 uri = u'%(protocol)s://%(user)s@%(host)s%(prefix)s/%(repo_name)s' % {
@@ -116,14 +116,14 b''
116 <span>${_('Summary')}</span>
116 <span>${_('Summary')}</span>
117 </a>
117 </a>
118 </li>
118 </li>
119 <li ${is_current('shortlog')}>
119 ##<li ${is_current('shortlog')}>
120 <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
120 ## <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
121 <span class="icon">
121 ## <span class="icon">
122 <img src="/images/icons/application_view_list.png" alt="${_('Shortlog')}" />
122 ## <img src="/images/icons/application_view_list.png" alt="${_('Shortlog')}" />
123 </span>
123 ## </span>
124 <span>${_('Shortlog')}</span>
124 ## <span>${_('Shortlog')}</span>
125 </a>
125 ## </a>
126 </li>
126 ##</li>
127 <li ${is_current('changelog')}>
127 <li ${is_current('changelog')}>
128 <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
128 <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
129 <span class="icon">
129 <span class="icon">
@@ -142,7 +142,7 b''
142 </a>
142 </a>
143 <ul>
143 <ul>
144 <li>
144 <li>
145 ${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
145 ${h.link_to('%s (%s)' % (_('branches'),len(c.repository_branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
146 <ul>
146 <ul>
147 %if c.repository_branches.values():
147 %if c.repository_branches.values():
148 %for cnt,branch in enumerate(c.repository_branches.items()):
148 %for cnt,branch in enumerate(c.repository_branches.items()):
@@ -154,7 +154,7 b''
154 </ul>
154 </ul>
155 </li>
155 </li>
156 <li>
156 <li>
157 ${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
157 ${h.link_to('%s (%s)' % (_('tags'),len(c.repository_tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
158 <ul>
158 <ul>
159 %if c.repository_tags.values():
159 %if c.repository_tags.values():
160 %for cnt,tag in enumerate(c.repository_tags.items()):
160 %for cnt,tag in enumerate(c.repository_tags.items()):
@@ -42,13 +42,11 b' E.onDOMReady(function(e){'
42 <label>${_('Name')}:</label>
42 <label>${_('Name')}:</label>
43 </div>
43 </div>
44 <div class="input-short">
44 <div class="input-short">
45
46 %if c.repo_info.dbrepo.repo_type =='hg':
45 %if c.repo_info.dbrepo.repo_type =='hg':
47 <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
46 <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
48 %elif c.repo_info.dbrepo.repo_type =='git':
47 %endif
48 %if c.repo_info.dbrepo.repo_type =='git':
49 <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
49 <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
50 %else:
51
52 %endif
50 %endif
53
51
54 %if c.repo_info.dbrepo.private:
52 %if c.repo_info.dbrepo.private:
@@ -561,10 +559,12 b' E.onDOMReady(function(e){'
561 <div class="breadcrumbs">${h.link_to(_('Last ten changes'),h.url('changelog_home',repo_name=c.repo_name))}</div>
559 <div class="breadcrumbs">${h.link_to(_('Last ten changes'),h.url('changelog_home',repo_name=c.repo_name))}</div>
562 </div>
560 </div>
563 <div class="table">
561 <div class="table">
562 <div id="shortlog_data">
564 <%include file='../shortlog/shortlog_data.html'/>
563 <%include file='../shortlog/shortlog_data.html'/>
565 %if c.repo_changesets:
564 </div>
566 ${h.link_to(_('show more'),h.url('changelog_home',repo_name=c.repo_name))}
565 ##%if c.repo_changesets:
567 %endif
566 ## ${h.link_to(_('show more'),h.url('changelog_home',repo_name=c.repo_name))}
567 ##%endif
568 </div>
568 </div>
569 </div>
569 </div>
570 <div class="box">
570 <div class="box">
General Comments 0
You need to be logged in to leave comments. Login now