kallithea Changeset - b04d5214fd3c

Changeset - b04d5214fd3c

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2010-10-26 04:01:38
marcin@python-works.com

removed shortlog from main menu, as duplicated functionality of changelog,
moved shortlog as ajax pagin in summary

3 files changed with 23 insertions and 18 deletions:

rhodecode/controllers/summary.py

rhodecode/templates/base/base.html

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/controllers/summary.py

➞

Show inline comments

@@ @@ -50,13 +50,18 @@ class SummaryController(BaseController): @@
     def __before__(self):
         super(SummaryController, self).__before__()
     def index(self):
         hg_model = HgModel()
         c.repo_info = hg_model.get_repo(c.repo_name)
         c.repo_changesets = Page(list(c.repo_info[:10]), page=1, items_per_page=20)
         def url_generator(**kw):
             return url('shortlog_home', repo_name=c.repo_name, **kw)
         c.repo_changesets = Page(c.repo_info, page=1, items_per_page=10,
                                  url=url_generator)
         e = request.environ
         uri = u'%(protocol)s://%(user)s@%(host)s%(prefix)s/%(repo_name)s' % {
                                         'protocol': e.get('wsgi.url_scheme'),
                                         'user':str(c.rhodecode_user.username),
                                         'host':e.get('HTTP_HOST'),

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -113,20 +113,20 @@ @@
 	               <span class="icon">
 	                   <img src="/images/icons/clipboard_16.png" alt="${_('Summary')}" />
 	               </span>
 	               <span>${_('Summary')}</span>
 	               </a>
 	            </li>
                 <li ${is_current('shortlog')}>
                    <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="/images/icons/application_view_list.png" alt="${_('Shortlog')}" />
                    </span>
                    <span>${_('Shortlog')}</span>
                    </a>
                 </li>
                 ##<li ${is_current('shortlog')}>
                 ##   <a title="${_('Shortlog')}" href="${h.url('shortlog_home',repo_name=c.repo_name)}">
                 ##   <span class="icon">
                 ##       <img src="/images/icons/application_view_list.png" alt="${_('Shortlog')}" />
                 ##   </span>
                 ##   <span>${_('Shortlog')}</span>
                 ##   </a>
                 ##</li>
                 <li ${is_current('changelog')}>
                    <a title="${_('Changelog')}" href="${h.url('changelog_home',repo_name=c.repo_name)}">
                    <span class="icon">
                        <img src="/images/icons/time.png" alt="${_('Changelog')}" />
                    </span>
                    <span>${_('Changelog')}</span>
@@ @@ -139,25 +139,25 @@ @@
                        <img src="/images/icons/arrow_switch.png" alt="${_('Switch to')}" />
                    </span>
                    <span>${_('Switch to')}</span>
                    </a>
                     <ul>
                         <li>
                             ${h.link_to(_('branches'),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
+                            ${h.link_to('%s (%s)' % (_('branches'),len(c.repository_branches.values()),),h.url('branches_home',repo_name=c.repo_name),class_='branches childs')}
                             <ul>
                             %if c.repository_branches.values():
 						        %for cnt,branch in enumerate(c.repository_branches.items()):
 						            <li>${h.link_to('%s - %s' % (branch[0],h.short_id(branch[1])),h.url('files_home',repo_name=c.repo_name,revision=branch[1]))}</li>
 						        %endfor
 						    %else:
 						    	<li>${h.link_to(_('There are no branches yet'),'#')}</li>
 						    %endif
                             </ul>
                         </li>
                         <li>
                             ${h.link_to(_('tags'),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
+                            ${h.link_to('%s (%s)' % (_('tags'),len(c.repository_tags.values()),),h.url('tags_home',repo_name=c.repo_name),class_='tags childs')}
                             <ul>
                             %if c.repository_tags.values():
                                 %for cnt,tag in enumerate(c.repository_tags.items()):
                                  <li>${h.link_to('%s - %s' % (tag[0],h.short_id(tag[1])),h.url('files_home',repo_name=c.repo_name,revision=tag[1]))}</li>
                                 %endfor
                             %else:

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -39,19 +39,17 @@ E.onDOMReady(function(e){ @@
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Name')}:</label>
 			  </div>
 			  <div class="input-short">
 		          %if c.repo_info.dbrepo.repo_type =='hg':
 		            <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="/images/icons/hgicon.png"/>
 		          %elif c.repo_info.dbrepo.repo_type =='git':
 		         %endif
 		         %if c.repo_info.dbrepo.repo_type =='git':
 		            <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="/images/icons/giticon.png"/>
 		          %else:
 		          %endif
 	             %if c.repo_info.dbrepo.private:
 	                <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="/images/icons/lock.png"/>
 	             %else:
 	                <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="/images/icons/lock_open.png"/>
@@ @@ -558,16 +556,18 @@ E.onDOMReady(function(e){ @@
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">${h.link_to(_('Last ten changes'),h.url('changelog_home',repo_name=c.repo_name))}</div>
     </div>
     <div class="table">
         <div id="shortlog_data">
         <%include file='../shortlog/shortlog_data.html'/>
         %if c.repo_changesets:
         	${h.link_to(_('show more'),h.url('changelog_home',repo_name=c.repo_name))}
         %endif
         </div>
         ##%if c.repo_changesets:
         ##	${h.link_to(_('show more'),h.url('changelog_home',repo_name=c.repo_name))}
         ##%endif
     </div>
 </div>
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">${h.link_to(_('Last ten tags'),h.url('tags_home',repo_name=c.repo_name))}</div>
     </div>

0 comments (0 inline, 0 general)