kallithea Changeset - 4a28aff31a15

Changeset - 4a28aff31a15

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 14 years ago 2011-11-25 19:05:59
marcin@python-works.com

optimized summary page for disabled stats

3 files changed with 68 insertions and 65 deletions:

rhodecode/controllers/summary.py

rhodecode/public/css/style.css

rhodecode/templates/summary/summary.html

0 comments (0 inline, 0 general)

rhodecode/controllers/summary.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 """
     rhodecode.controllers.summary
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     Summary controller for Rhodecode
     :created_on: Apr 18, 2010
     :author: marcink
     :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import traceback
 import calendar
 import logging
 from time import mktime
 from datetime import timedelta, date
 from itertools import product
 from urlparse import urlparse
 from vcs.exceptions import ChangesetError, EmptyRepositoryError, \
     NodeDoesNotExistError
 from pylons import tmpl_context as c, request, url, config
 from pylons.i18n.translation import _
 from beaker.cache import cache_region, region_invalidate
 from rhodecode.model.db import Statistics, CacheInvalidation
 from rhodecode.lib import ALL_READMES, ALL_EXTS
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from rhodecode.lib.base import BaseRepoController, render
 from rhodecode.lib.utils import EmptyChangeset
 from rhodecode.lib.markup_renderer import MarkupRenderer
 from rhodecode.lib.celerylib import run_task
 from rhodecode.lib.celerylib.tasks import get_commits_stats, \
     LANGUAGES_EXTENSIONS_MAP
 from rhodecode.lib.helpers import RepoPage
 from rhodecode.lib.compat import json, OrderedDict
 log = logging.getLogger(__name__)
 README_FILES = [''.join([x[0][0], x[1][0]]) for x in
                     sorted(list(product(ALL_READMES, ALL_EXTS)),
                            key=lambda y:y[0][1] + y[1][1])]
 class SummaryController(BaseRepoController):
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def __before__(self):
         super(SummaryController, self).__before__()
     def index(self, repo_name):
         e = request.environ
         c.dbrepo = dbrepo = c.rhodecode_db_repo
         c.following = self.scm_model.is_following_repo(repo_name,
                                                 self.rhodecode_user.user_id)
         def url_generator(**kw):
             return url('shortlog_home', repo_name=repo_name, size=10, **kw)
         c.repo_changesets = RepoPage(c.rhodecode_repo, page=1,
                                      items_per_page=10, url=url_generator)
         if self.rhodecode_user.username == 'default':
             # for default(anonymous) user we don't need to pass credentials
             username = ''
             password = ''
         else:
             username = str(self.rhodecode_user.username)
             password = '@'
         parsed_url = urlparse(url.current(qualified=True))
         default_clone_uri = '{scheme}://{user}{pass}{netloc}{path}'
         uri_tmpl = config.get('clone_uri',default_clone_uri)
         uri_tmpl = uri_tmpl.replace('{','%(').replace('}',')s')
         uri =  uri_tmpl % {'user': username,
                            'pass': password,
                            'scheme': parsed_url.scheme,
                            'netloc':parsed_url.netloc,
                            'path':parsed_url.path}
         c.clone_repo_url = uri
         c.repo_tags = OrderedDict()
         for name, hash in c.rhodecode_repo.tags.items()[:10]:
             try:
                 c.repo_tags[name] = c.rhodecode_repo.get_changeset(hash)
             except ChangesetError:
                 c.repo_tags[name] = EmptyChangeset(hash)
         c.repo_branches = OrderedDict()
         for name, hash in c.rhodecode_repo.branches.items()[:10]:
             try:
                 c.repo_branches[name] = c.rhodecode_repo.get_changeset(hash)
             except ChangesetError:
                 c.repo_branches[name] = EmptyChangeset(hash)
         td = date.today() + timedelta(days=1)
         td_1m = td - timedelta(days=calendar.mdays[td.month])
         td_1y = td - timedelta(days=365)
         ts_min_m = mktime(td_1m.timetuple())
         ts_min_y = mktime(td_1y.timetuple())
         ts_max_y = mktime(td.timetuple())
         if dbrepo.enable_statistics:
             c.show_stats = True
             c.no_data_msg = _('No data loaded yet')
             run_task(get_commits_stats, c.dbrepo.repo_name, ts_min_y, ts_max_y)
         else:
             c.show_stats = False
             c.no_data_msg = _('Statistics are disabled for this repository')
         c.ts_min = ts_min_m
         c.ts_max = ts_max_y
         stats = self.sa.query(Statistics)\
             .filter(Statistics.repository == dbrepo)\
             .scalar()
         c.stats_percentage = 0
         if stats and stats.languages:
             c.no_data = False is dbrepo.enable_statistics
             lang_stats_d = json.loads(stats.languages)
             c.commit_data = stats.commit_activity
             c.overview_data = stats.commit_activity_combined
             lang_stats = ((x, {"count": y,
                                "desc": LANGUAGES_EXTENSIONS_MAP.get(x)})
                           for x, y in lang_stats_d.items())
             c.trending_languages = json.dumps(OrderedDict(
                                        sorted(lang_stats, reverse=True,
                                             key=lambda k: k[1])[:10]
+                                        )
+                                    )
             last_rev = stats.stat_on_revision
             c.repo_last_rev = c.rhodecode_repo.count() - 1 \
                 if c.rhodecode_repo.revisions else 0
             if last_rev == 0 or c.repo_last_rev == 0:
                 pass
             else:
                 c.stats_percentage = '%.2f' % ((float((last_rev)) /
                                                 c.repo_last_rev) * 100)
         else:
             c.commit_data = json.dumps({})
             c.overview_data = json.dumps([[ts_min_y, 0], [ts_max_y, 10]])
             c.trending_languages = json.dumps({})
             c.no_data = True
         c.enable_downloads = dbrepo.enable_downloads
         if c.enable_downloads:
             c.download_options = self._get_download_links(c.rhodecode_repo)
         c.readme_data, c.readme_file = self.__get_readme_data(c.rhodecode_repo)
         return render('summary/summary.html')
     def __get_readme_data(self, repo):
         @cache_region('long_term')
         def _get_readme_from_cache(key):
             readme_data = None
             readme_file = None
             log.debug('Fetching readme file')
             try:
                 cs = repo.get_changeset('tip')
                 renderer = MarkupRenderer()
                 for f in README_FILES:
                     try:
                         readme = cs.get_node(f)
                         readme_file = f
                         readme_data = renderer.render(readme.content, f)
                         log.debug('Found readme %s' % readme_file)
                         break
                     except NodeDoesNotExistError:
                         continue
             except ChangesetError:
                 pass
             except EmptyRepositoryError:
                 pass
             except Exception:
                 log.error(traceback.format_exc())
             return readme_data, readme_file
         key = repo.name + '_README'
         inv = CacheInvalidation.invalidate(key)
         if inv is not None:
             region_invalidate(_get_readme_from_cache, None, key)
             CacheInvalidation.set_valid(inv.cache_key)
         return _get_readme_from_cache(key)
     def _get_download_links(self, repo):
         download_l = []
         branches_group = ([], _("Branches"))
         tags_group = ([], _("Tags"))
         for name, chs in c.rhodecode_repo.branches.items():
             #chs = chs.split(':')[-1]
             branches_group[0].append((chs, name),)
         download_l.append(branches_group)
         for name, chs in c.rhodecode_repo.tags.items():
             #chs = chs.split(':')[-1]
             tags_group[0].append((chs, name),)
         download_l.append(tags_group)
         return download_l

rhodecode/public/css/style.css

➞

Show inline comments

@@ @@ -804,385 +804,385 @@ div.options a { @@
 #content div.box blockquote p {
 	margin: 10px 0;
 	padding: 0;
+}
 #content div.box dl {
 	margin: 10px 24px;
+}
 #content div.box dt {
 	font-size: 12px;
 	margin: 0;
+}
 #content div.box dd {
 	font-size: 12px;
 	margin: 0;
 	padding: 8px 0 8px 15px;
+}
 #content div.box li {
 	font-size: 12px;
 	padding: 4px 0;
+}
 #content div.box ul.disc,#content div.box ul.circle {
 	margin: 10px 24px 10px 38px;
+}
 #content div.box ul.square {
 	margin: 10px 24px 10px 40px;
+}
 #content div.box img.left {
 	border: none;
 	float: left;
 	margin: 10px 10px 10px 0;
+}
 #content div.box img.right {
 	border: none;
 	float: right;
 	margin: 10px 0 10px 10px;
+}
 #content div.box div.messages {
 	clear: both;
 	overflow: hidden;
 	margin: 0 20px;
 	padding: 0;
+}
 #content div.box div.message {
 	clear: both;
 	overflow: hidden;
 	margin: 0;
 	padding: 10px 0;
+}
 #content div.box div.message a {
 	font-weight: 400 !important;
+}
 #content div.box div.message div.image {
 	float: left;
 	margin: 9px 0 0 5px;
 	padding: 6px;
+}
 #content div.box div.message div.image img {
 	vertical-align: middle;
 	margin: 0;
+}
 #content div.box div.message div.text {
 	float: left;
 	margin: 0;
 	padding: 9px 6px;
+}
 #content div.box div.message div.dismiss a {
 	height: 16px;
 	width: 16px;
 	display: block;
 	background: url("../images/icons/cross.png") no-repeat;
 	margin: 15px 14px 0 0;
 	padding: 0;
+}
 #content div.box div.message div.text h1,#content div.box div.message div.text h2,#content div.box div.message div.text h3,#content div.box div.message div.text h4,#content div.box div.message div.text h5,#content div.box div.message div.text h6
+	{
 	border: none;
 	margin: 0;
 	padding: 0;
+}
 #content div.box div.message div.text span {
 	height: 1%;
 	display: block;
 	margin: 0;
 	padding: 5px 0 0;
+}
 #content div.box div.message-error {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #FBE3E4;
 	border: 1px solid #FBC2C4;
 	color: #860006;
+}
 #content div.box div.message-error h6 {
 	color: #860006;
+}
 #content div.box div.message-warning {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #FFF6BF;
 	border: 1px solid #FFD324;
 	color: #5f5200;
+}
 #content div.box div.message-warning h6 {
 	color: #5f5200;
+}
 #content div.box div.message-notice {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #8FBDE0;
 	border: 1px solid #6BACDE;
 	color: #003863;
+}
 #content div.box div.message-notice h6 {
 	color: #003863;
+}
 #content div.box div.message-success {
 	height: 1%;
 	clear: both;
 	overflow: hidden;
 	background: #E6EFC2;
 	border: 1px solid #C6D880;
 	color: #4e6100;
+}
 #content div.box div.message-success h6 {
 	color: #4e6100;
+}
 #content div.box div.form div.fields div.field {
 	height: 1%;
 	border-bottom: 1px solid #DDD;
 	clear: both;
 	margin: 0;
 	padding: 10px 0;
+}
 #content div.box div.form div.fields div.field-first {
 	padding: 0 0 10px;
+}
 #content div.box div.form div.fields div.field-noborder {
 	border-bottom: 0 !important;
+}
 #content div.box div.form div.fields div.field span.error-message {
 	height: 1%;
 	display: inline-block;
 	color: red;
 	margin: 8px 0 0 4px;
 	padding: 0;
+}
 #content div.box div.form div.fields div.field span.success {
 	height: 1%;
 	display: block;
 	color: #316309;
 	margin: 8px 0 0;
 	padding: 0;
+}
 #content div.box div.form div.fields div.field div.label {
 	left: 70px;
 	width: 155px;
 	position: absolute;
 	margin: 0;
-	padding: 8px 0 0 5px;
+	padding: 0px 0 0 0px;
+}
 #content div.box-left div.form div.fields div.field div.label,#content div.box-right div.form div.fields div.field div.label
+	{
 	clear: both;
 	overflow: hidden;
 	left: 0;
 	width: auto;
 	position: relative;
 	margin: 0;
 	padding: 0 0 8px;
+}
 #content div.box div.form div.fields div.field div.label-select {
 	padding: 5px 0 0 5px;
+}
 #content div.box-left div.form div.fields div.field div.label-select,#content div.box-right div.form div.fields div.field div.label-select
+	{
 	padding: 0 0 8px;
+}
 #content div.box-left div.form div.fields div.field div.label-textarea,#content div.box-right div.form div.fields div.field div.label-textarea
+	{
 	padding: 0 0 8px !important;
+}
 #content div.box div.form div.fields div.field div.label label,div.label label
+	{
 	color: #393939;
 	font-weight: 700;
+}
 #content div.box div.form div.fields div.field div.input {
 	margin: 0 0 0 200px;
+}
 #content div.box div.form div.fields div.field div.file {
 	margin: 0 0 0 200px;
+}
 #content div.box-left div.form div.fields div.field div.input,#content div.box-right div.form div.fields div.field div.input
+	{
 	margin: 0 0 0 0px;
+}
 #content div.box div.form div.fields div.field div.input input {
 	background: #FFF;
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	color: #000;
 	font-size: 11px;
 	margin: 0;
 	padding: 7px 7px 6px;
+}
 #content div.box div.form div.fields div.field div.file input {
 	background: none repeat scroll 0 0 #FFFFFF;
 	border-color: #B3B3B3 #EAEAEA #EAEAEA #B3B3B3;
 	border-style: solid;
 	border-width: 1px;
 	color: #000000;
 	font-size: 11px;
 	margin: 0;
 	padding: 7px 7px 6px;
+}
 #content div.box div.form div.fields div.field div.input input.small {
 	width: 30%;
+}
 #content div.box div.form div.fields div.field div.input input.medium {
 	width: 55%;
+}
 #content div.box div.form div.fields div.field div.input input.large {
 	width: 85%;
+}
 #content div.box div.form div.fields div.field div.input input.date {
 	width: 177px;
+}
 #content div.box div.form div.fields div.field div.input input.button {
 	background: #D4D0C8;
 	border-top: 1px solid #FFF;
 	border-left: 1px solid #FFF;
 	border-right: 1px solid #404040;
 	border-bottom: 1px solid #404040;
 	color: #000;
 	margin: 0;
 	padding: 4px 8px;
+}
 #content div.box div.form div.fields div.field div.textarea {
 	border-top: 1px solid #b3b3b3;
 	border-left: 1px solid #b3b3b3;
 	border-right: 1px solid #eaeaea;
 	border-bottom: 1px solid #eaeaea;
 	margin: 0 0 0 200px;
 	padding: 10px;
+}
 #content div.box div.form div.fields div.field div.textarea-editor {
 	border: 1px solid #ddd;
 	padding: 0;
+}
 #content div.box div.form div.fields div.field div.textarea textarea {
 	width: 100%;
 	height: 220px;
 	overflow: hidden;
 	background: #FFF;
 	color: #000;
 	font-size: 11px;
 	outline: none;
 	border-width: 0;
 	margin: 0;
 	padding: 0;
+}
 #content div.box-left div.form div.fields div.field div.textarea textarea,#content div.box-right div.form div.fields div.field div.textarea textarea
+	{
 	width: 100%;
 	height: 100px;
+}
 #content div.box div.form div.fields div.field div.textarea table {
 	width: 100%;
 	border: none;
 	margin: 0;
 	padding: 0;
+}
 #content div.box div.form div.fields div.field div.textarea table td {
 	background: #DDD;
 	border: none;
 	padding: 0;
+}
 #content div.box div.form div.fields div.field div.textarea table td table
+	{
 	width: auto;
 	border: none;
 	margin: 0;
 	padding: 0;
+}
 #content div.box div.form div.fields div.field div.textarea table td table td
+	{
 	font-size: 11px;
 	padding: 5px 5px 5px 0;
+}
 #content div.box div.form div.fields div.field input[type=text]:focus,#content div.box div.form div.fields div.field input[type=password]:focus,#content div.box div.form div.fields div.field input[type=file]:focus,#content div.box div.form div.fields div.field textarea:focus,#content div.box div.form div.fields div.field select:focus
+	{
 	background: #f6f6f6;
 	border-color: #666;
+}
 div.form div.fields div.field div.button {
 	margin: 0;
 	padding: 0 0 0 8px;
+}
 #content div.box table.noborder {
 	border: 1px solid transparent;
+}
 #content div.box table {
 	width: 100%;
 	border-collapse: separate;
 	margin: 0;
 	padding: 0;
 	border: 1px solid #eee;
     -webkit-border-radius: 4px;
     -moz-border-radius: 4px;
     border-radius: 4px;
+}
 #content div.box table th {
 	background: #eee;
 	border-bottom: 1px solid #ddd;
 	padding: 5px 0px 5px 5px;
+}
 #content div.box table th.left {
 	text-align: left;
+}
 #content div.box table th.right {

rhodecode/templates/summary/summary.html

➞

Show inline comments

 <%inherit file="/base/base.html"/>
 <%def name="title()">
     ${c.repo_name} ${_('Summary')} - ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${h.link_to(u'Home',h.url('/'))}
     &raquo;
     ${h.link_to(c.dbrepo.just_name,h.url('summary_home',repo_name=c.repo_name))}
     &raquo;
     ${_('summary')}
 </%def>
 <%def name="page_nav()">
 	${self.menu('summary')}
 </%def>
 <%def name="main()">
     %if c.show_stats:
 <div class="box box-left">
     %else:
         <div class="box">
     %endif
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
 	<div class="form">
 	  <div id="summary" class="fields">
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Name')}:</label>
 			  </div>
 			  <div class="input-short">
 			  <div class="input">
                   <div style="float:right;padding-top:5px">
                      %if c.rhodecode_user.username != 'default':
                       ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='rss_icon')}
                       ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='atom_icon')}
                      %else:
                       ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name),class_='rss_icon')}
                       ${h.link_to(_('ATOM'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='atom_icon')}
                      %endif
                   </div>
                   %if c.rhodecode_user.username != 'default':
                       %if c.following:
                       <span id="follow_toggle" class="following" title="${_('Stop following this repository')}"
                             onclick="javascript:toggleFollowingRepo(this,${c.dbrepo.repo_id},'${str(h.get_token())}')">
                       </span>
                       %else:
                       <span id="follow_toggle" class="follow" title="${_('Start following this repository')}"
                             onclick="javascript:toggleFollowingRepo(this,${c.dbrepo.repo_id},'${str(h.get_token())}')">
                       </span>
                       %endif
                   %endif:
                  ##REPO TYPE
 		         %if c.dbrepo.repo_type =='hg':
 		           <img style="margin-bottom:2px" class="icon" title="${_('Mercurial repository')}" alt="${_('Mercurial repository')}" src="${h.url('/images/icons/hgicon.png')}"/>
 		         %endif
 		         %if c.dbrepo.repo_type =='git':
 		           <img style="margin-bottom:2px" class="icon" title="${_('Git repository')}" alt="${_('Git repository')}" src="${h.url('/images/icons/giticon.png')}"/>
 		         %endif
                  ##PUBLIC/PRIVATE
 	             %if c.dbrepo.private:
 	                <img style="margin-bottom:2px" class="icon" title="${_('private repository')}" alt="${_('private repository')}" src="${h.url('/images/icons/lock.png')}"/>
 	             %else:
 	                <img style="margin-bottom:2px" class="icon" title="${_('public repository')}" alt="${_('public repository')}" src="${h.url('/images/icons/lock_open.png')}"/>
 	             %endif
 	              ##REPO NAME
 			      <span class="repo_name">${h.repo_link(c.dbrepo.groups_and_repo)}</span>
                   ##FORK
 		          %if c.dbrepo.fork:
 	            	<div style="margin-top:5px;clear:both"">
 	            	<a href="${h.url('summary_home',repo_name=c.dbrepo.fork.repo_name)}"><img class="icon" alt="${_('public')}" title="${_('Fork of')} ${c.dbrepo.fork.repo_name}" src="${h.url('/images/icons/arrow_divide.png')}"/>
 	            	    ${_('Fork of')} ${c.dbrepo.fork.repo_name}
 	            	</a>
 	            	</div>
 		          %endif
 		          ##REMOTE
 				  %if c.dbrepo.clone_uri:
                     <div style="margin-top:5px;clear:both">
                     <a href="${h.url(str(h.hide_credentials(c.dbrepo.clone_uri)))}"><img class="icon" alt="${_('remote clone')}" title="${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)}" src="${h.url('/images/icons/connect.png')}"/>
                         ${_('Clone from')} ${h.hide_credentials(c.dbrepo.clone_uri)}
                     </a>
                     </div>
 				  %endif
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Description')}:</label>
 			  </div>
-			  <div class="input-short desc">${h.urlify_text(c.dbrepo.description)}</div>
 			  <div class="input desc">${h.urlify_text(c.dbrepo.description)}</div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Contact')}:</label>
 			  </div>
-			  <div class="input-short">
 			  <div class="input">
 			  	<div class="gravatar">
 			  		<img alt="gravatar" src="${h.gravatar_url(c.dbrepo.user.email)}"/>
 			  	</div>
 			  		${_('Username')}: ${c.dbrepo.user.username}<br/>
 			  		${_('Name')}: ${c.dbrepo.user.name} ${c.dbrepo.user.lastname}<br/>
 			  		${_('Email')}: <a href="mailto:${c.dbrepo.user.email}">${c.dbrepo.user.email}</a>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Last change')}:</label>
 			  </div>
-			  <div class="input-short">
 			  <div class="input">
                   <b>${'r%s:%s' % (h.get_changeset_safe(c.rhodecode_repo,'tip').revision,
                             h.get_changeset_safe(c.rhodecode_repo,'tip').short_id)}</b> -
 			      <span class="tooltip" title="${c.rhodecode_repo.last_change}">
-			      ${h.age(c.rhodecode_repo.last_change)}</span><br/>
 			      ${h.age(c.rhodecode_repo.last_change)}</span>
 			      ${_('by')} ${h.get_changeset_safe(c.rhodecode_repo,'tip').author}
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Clone url')}:</label>
 			  </div>
 			  <div class="input-short">
 			      <input type="text" id="clone_url" readonly="readonly" value="${c.rhodecode_repo.alias} clone ${c.clone_repo_url}" size="70"/>
 			  <div class="input">
 			      <input type="text" id="clone_url" readonly="readonly" value="${c.rhodecode_repo.alias} clone ${c.clone_repo_url}" size="65"/>
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Trending source files')}:</label>
 			  </div>
 			  <div class="input-short">
 			  <div class="input">
                 %if c.show_stats:
 			    <div id="lang_stats"></div>
                 %else:
                    %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
                         ${_('Statistics are disabled for this repository')} ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-button-small")}
                    %endif
                 %endif
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Download')}:</label>
 			  </div>
-			  <div class="input-short">
 			  <div class="input">
 		        %if len(c.rhodecode_repo.revisions) == 0:
 		          ${_('There are no downloads yet')}
 		        %elif c.enable_downloads is False:
 		          ${_('Downloads are disabled for this repository')}
-                    %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
+                    %if h.HasPermissionAll('hg.admin')('enable downloads on from summary'):
                         ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-button-small")}
                     %endif
 		        %else:
 			        ${h.select('download_options',c.rhodecode_repo.get_changeset().raw_id,c.download_options)}
 			        %for cnt,archive in enumerate(c.rhodecode_repo._get_archives()):
 			             %if cnt >=1:
+			             |
 			             %endif
 			             <span class="tooltip" title="${_('Download %s as %s') %('tip',archive['type'])}"
 			                  id="${archive['type']+'_link'}">${h.link_to(archive['type'],
 			                h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
 			                fname='tip'+archive['extension']),class_="archive_icon")}</span>
 			        %endfor
                     <span style="vertical-align: bottom">
                         <input id="archive_subrepos" type="checkbox" name="subrepos"/> <span class="tooltip" title="${_('Check this to download archive with subrepos')}" >${_('with subrepos')}</span>
                     </span>
 			    %endif
 			  </div>
 			 </div>
 			 <div class="field">
 			  <div class="label">
 			      <label>${_('Feeds')}:</label>
 			  </div>
 			  <div class="input-short">
 			   %if c.rhodecode_user.username != 'default':
 	            ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='rss_icon')}
 	            ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name,api_key=c.rhodecode_user.api_key),class_='atom_icon')}
 	           %else:
                 ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.dbrepo.repo_name),class_='rss_icon')}
                 ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.dbrepo.repo_name),class_='atom_icon')}
 	           %endif
 			  </div>
 			 </div>
 	  </div>
 	</div>
 </div>
 %if c.show_stats:
 <div class="box box-right"  style="min-height:455px">
     <!-- box / title -->
     <div class="title">
         <h5>${_('Commit activity by day / author')}</h5>
     </div>
     <div class="graph">
          <div style="padding:0 10px 10px 15px;font-size: 1.2em;">
          %if c.no_data:
            ${c.no_data_msg}
            %if h.HasPermissionAll('hg.admin')('enable stats on from summary'):
                 ${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name),class_="ui-button-small")}
            %endif
         %else:
             ${_('Loaded in')} ${c.stats_percentage} %
         %endif
         </div>
         <div id="commit_history" style="width:450px;height:300px;float:left"></div>
         <div style="clear: both;height: 10px"></div>
         <div id="overview" style="width:450px;height:100px;float:left"></div>
     	<div id="legend_data" style="clear:both;margin-top:10px;">
 	    	<div id="legend_container"></div>
 	    	<div id="legend_choices">
 				<table id="legend_choices_tables" class="noborder" style="font-size:smaller;color:#545454"></table>
 	    	</div>
     	</div>
     </div>
 </div>
 %endif
 <div class="box">
     <div class="title">
         <div class="breadcrumbs">${h.link_to(_('Shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}</div>
     </div>
     <div class="table">
         <div id="shortlog_data">
             <%include file='../shortlog/shortlog_data.html'/>
         </div>
     </div>
 </div>
 %if c.readme_data:
 <div class="box" style="background-color: #FAFAFA">
     <div class="title">
         <div class="breadcrumbs"><a href="${h.url('files_home',repo_name=c.repo_name,revision='tip',f_path=c.readme_file)}">${c.readme_file}</a></div>
     </div>
     <div class="readme">
       <div class="readme_box">
         ${c.readme_data|n}
       </div>
     </div>
 </div>
 %endif
 <script type="text/javascript">
         YUE.onDOMReady(function(e){
             id = 'clone_url';
             YUE.on(id,'click',function(e){
                 if(YUD.hasClass(id,'selected')){
 var clone_url = 'clone_url';
 YUE.on(clone_url,'click',function(e){
     if(YUD.hasClass(clone_url,'selected')){
                     return
+                }
                 else{
                     YUD.addClass(id,'selected');
                     YUD.get(id).select();
         YUD.addClass(clone_url,'selected');
         YUD.get(clone_url).select();
+                }
 })
             })
         })
 var tmpl_links = {};
 %for cnt,archive in enumerate(c.rhodecode_repo._get_archives()):
   tmpl_links['${archive['type']}'] = '${h.link_to(archive['type'],
        h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
        fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_="archive_icon")}';
 %endfor
 YUE.on(['download_options','archive_subrepos'],'change',function(e){
    var sm = YUD.get('download_options');
    var new_cs = sm.options[sm.selectedIndex];
    for(k in tmpl_links){
        var s = YUD.get(k+'_link');
        title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}";
        s.title = title_tmpl.replace('__CS_NAME__',new_cs.text);
        s.title = s.title.replace('__CS_EXT__',k);
        var url = tmpl_links[k].replace('__CS__',new_cs.value);
        var subrepos = YUD.get('archive_subrepos').checked
        url = url.replace('__SUB__',subrepos);
        s.innerHTML = url
+   }
 });
 </script>
 %if c.show_stats:
 <script type="text/javascript">
         var data = ${c.trending_languages|n};
         var total = 0;
         var no_data = true;
         for (k in data){
             total += data[k].count;
             no_data = false;
+        }
         var tbl = document.createElement('table');
         tbl.setAttribute('class','trending_language_tbl');
         var cnt = 0;
         for (k in data){
             cnt += 1;
             var hide = cnt>2;
             var tr = document.createElement('tr');
             if (hide){
                 tr.setAttribute('style','display:none');
                 tr.setAttribute('class','stats_hidden');
+            }
             var percentage = Math.round((data[k].count/total*100),2);
             var value = data[k].count;
             var td1 = document.createElement('td');
             td1.width = 150;
             var trending_language_label = document.createElement('div');
             trending_language_label.innerHTML = data[k].desc+" ("+k+")";
             td1.appendChild(trending_language_label);
             var td2 = document.createElement('td');
             td2.setAttribute('style','padding-right:14px !important');
             var trending_language = document.createElement('div');
             var nr_files = value+" ${_('files')}";
             trending_language.title = k+" "+nr_files;
             if (percentage>22){
                 trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"% "+nr_files+ "</b>";
+            }
             else{
                 trending_language.innerHTML = "<b style='font-size:0.8em'>"+percentage+"%</b>";
+            }
             trending_language.setAttribute("class", 'trending_language top-right-rounded-corner bottom-right-rounded-corner');
             trending_language.style.width=percentage+"%";
             td2.appendChild(trending_language);
             tr.appendChild(td1);
             tr.appendChild(td2);
             tbl.appendChild(tr);
             if(cnt == 3){
                 var show_more = document.createElement('tr');
                 var td = document.createElement('td');
                 lnk = document.createElement('a');
                 lnk.href='#';
                 lnk.innerHTML = "${_('show more')}";
                 lnk.id='code_stats_show_more';
                 td.appendChild(lnk);
                 show_more.appendChild(td);
                 show_more.appendChild(document.createElement('td'));
                 tbl.appendChild(show_more);
+            }
+        }
         if(no_data){
             var tr = document.createElement('tr');
             var td1 = document.createElement('td');
             td1.innerHTML = "${c.no_data_msg}";
             tr.appendChild(td1);
             tbl.appendChild(tr);
+        }
         YUD.get('lang_stats').appendChild(tbl);
         YUE.on('code_stats_show_more','click',function(){
             l = YUD.getElementsByClassName('stats_hidden')
             for (e in l){
                 YUD.setStyle(l[e],'display','');
             };
             YUD.setStyle(YUD.get('code_stats_show_more'),
                     'display','none');
         })
              var tmpl_links = {}
               %for cnt,archive in enumerate(c.rhodecode_repo._get_archives()):
                 tmpl_links['${archive['type']}'] = '${h.link_to(archive['type'],
                      h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
                      fname='__CS__'+archive['extension'],subrepos='__SUB__'),class_="archive_icon")}';
               %endfor
              YUE.on(['download_options','archive_subrepos'],'change',function(e){
                  var sm = YUD.get('download_options');
                  var new_cs = sm.options[sm.selectedIndex];
                  for(k in tmpl_links){
                      var s = YUD.get(k+'_link');
                      title_tmpl = "${_('Download %s as %s') % ('__CS_NAME__','__CS_EXT__')}";
                      s.title = title_tmpl.replace('__CS_NAME__',new_cs.text);
                      s.title = s.title.replace('__CS_EXT__',k);
                      var url = tmpl_links[k].replace('__CS__',new_cs.value);
                      var subrepos = YUD.get('archive_subrepos').checked
                      url = url.replace('__SUB__',subrepos);
                      s.innerHTML = url
+                 }
              });
     </script>
 <script type="text/javascript">
         /**
          * Plots summary graph
+         *
          * @class SummaryPlot
          * @param {from} initial from for detailed graph
          * @param {to} initial to for detailed graph
          * @param {dataset}
          * @param {overview_dataset}
          */
         function SummaryPlot(from,to,dataset,overview_dataset) {
             var initial_ranges = {
                 "xaxis":{
                     "from":from,
                     "to":to,
                 },
             };
             var dataset = dataset;
             var overview_dataset = [overview_dataset];
             var choiceContainer = YUD.get("legend_choices");
             var choiceContainerTable = YUD.get("legend_choices_tables");
             var plotContainer = YUD.get('commit_history');
             var overviewContainer = YUD.get('overview');
             var plot_options = {
                 bars: {show:true,align:'center',lineWidth:4},
                 legend: {show:true, container:"legend_container"},
                 points: {show:true,radius:0,fill:false},
                 yaxis: {tickDecimals:0,},
                 xaxis: {
                     mode: "time",
                     timeformat: "%d/%m",
                     min:from,
                     max:to,
                 },
                 grid: {
                     hoverable: true,
                     clickable: true,
                     autoHighlight:true,
                     color: "#999"
                 },
                 //selection: {mode: "x"}
             };
             var overview_options = {
                 legend:{show:false},
                 bars: {show:true,barWidth: 2,},
                 shadowSize: 0,
                 xaxis: {mode: "time", timeformat: "%d/%m/%y",},
                 yaxis: {ticks: 3, min: 0,tickDecimals:0,},
                 grid: {color: "#999",},
                 selection: {mode: "x"}
             };
             /**
             *get dummy data needed in few places
             */
             function getDummyData(label){
                 return {"label":label,
                  "data":[{"time":0,
                      "commits":0,
                          "added":0,
                          "changed":0,
                          "removed":0,
                     }],
                     "schema":["commits"],
                     "color":'#ffffff',
+                }
+            }
             /**
              * generate checkboxes accordindly to data
              * @param keys
              * @returns
              */
             function generateCheckboxes(data) {
                 //append checkboxes
                 var i = 0;
                 choiceContainerTable.innerHTML = '';
                 for(var pos in data) {
                     data[pos].color = i;
                     i++;
                     if(data[pos].label != ''){
                         choiceContainerTable.innerHTML += '<tr><td>'+
                         '<input type="checkbox" name="' + data[pos].label +'" checked="checked" />'
                         +data[pos].label+
                         '</td></tr>';
+                    }
+                }
+            }
             /**
              * ToolTip show
              */
             function showTooltip(x, y, contents) {
                 var div=document.getElementById('tooltip');
                 if(!div) {
                     div = document.createElement('div');
                     div.id="tooltip";
                     div.style.position="absolute";
                     div.style.border='1px solid #fdd';
                     div.style.padding='2px';
                     div.style.backgroundColor='#fee';
                     document.body.appendChild(div);
+                }
                 YUD.setStyle(div, 'opacity', 0);
                 div.innerHTML = contents;
                 div.style.top=(y + 5) + "px";
                 div.style.left=(x + 5) + "px";
                 var anim = new YAHOO.util.Anim(div, {opacity: {to: 0.8}}, 0.2);
                 anim.animate();
+            }
             /**
              * This function will detect if selected period has some changesets
                for this user if it does this data is then pushed for displaying
                Additionally it will only display users that are selected by the checkbox
             */
             function getDataAccordingToRanges(ranges) {
                 var data = [];
                 var new_dataset = {};
                 var keys = [];
                 var max_commits = 0;
                 for(var key in dataset){
                     for(var ds in dataset[key].data){
                         commit_data = dataset[key].data[ds];
                         if (commit_data.time >= ranges.xaxis.from && commit_data.time <= ranges.xaxis.to){
                             if(new_dataset[key] === undefined){
                                 new_dataset[key] = {data:[],schema:["commits"],label:key};
+                            }
                             new_dataset[key].data.push(commit_data);
+                        }
+                    }
                     if (new_dataset[key] !== undefined){
                         data.push(new_dataset[key]);
+                    }
+                }
                 if (data.length > 0){
                     return data;
+                }
                 else{
                     //just return dummy data for graph to plot itself
                     return [getDummyData('')];
+                }
+            }
             /**
             * redraw using new checkbox data
             */
             function plotchoiced(e,args){
                 var cur_data = args[0];
                 var cur_ranges = args[1];
                 var new_data = [];
                 var inputs = choiceContainer.getElementsByTagName("input");
                 //show only checked labels
                 for(var i=0; i<inputs.length; i++) {
                     var checkbox_key = inputs[i].name;
                     if(inputs[i].checked){
                         for(var d in cur_data){
                             if(cur_data[d].label == checkbox_key){
                                 new_data.push(cur_data[d]);
+                            }
+                        }
+                    }
                     else{
                         //push dummy data to not hide the label
                         new_data.push(getDummyData(checkbox_key));
+                    }
+                }
                 var new_options = YAHOO.lang.merge(plot_options, {
                     xaxis: {
                         min: cur_ranges.xaxis.from,
                         max: cur_ranges.xaxis.to,
                         mode:"time",
                         timeformat: "%d/%m",
                     },
                 });
                 if (!new_data){
                     new_data = [[0,1]];
+                }
                 // do the zooming
                plot = YAHOO.widget.Flot(plotContainer, new_data, new_options);
                plot.subscribe("plotselected", plotselected);
                //resubscribe plothover
                plot.subscribe("plothover", plothover);
                // don't fire event on the overview to prevent eternal loop
                overview.setSelection(cur_ranges, true);
+            }
             /**
              * plot only selected items from overview
              * @param ranges
              * @returns
              */
             function plotselected(ranges,cur_data) {
                 //updates the data for new plot
                 var data = getDataAccordingToRanges(ranges);
                 generateCheckboxes(data);
                 var new_options = YAHOO.lang.merge(plot_options, {
                     xaxis: {
                         min: ranges.xaxis.from,
                         max: ranges.xaxis.to,
                         mode:"time",
                         timeformat: "%d/%m",
                     },
                 });
                 // do the zooming
                 plot = YAHOO.widget.Flot(plotContainer, data, new_options);
                 plot.subscribe("plotselected", plotselected);
                 //resubscribe plothover
                 plot.subscribe("plothover", plothover);
                 // don't fire event on the overview to prevent eternal loop
                 overview.setSelection(ranges, true);
                 //resubscribe choiced
                 YUE.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, ranges]);
+            }
             var previousPoint = null;
             function plothover(o) {
                 var pos = o.pos;
                 var item = o.item;
                 //YUD.get("x").innerHTML = pos.x.toFixed(2);
                 //YUD.get("y").innerHTML = pos.y.toFixed(2);
                 if (item) {
                     if (previousPoint != item.datapoint) {
                         previousPoint = item.datapoint;
                         var tooltip = YUD.get("tooltip");
                         if(tooltip) {
                               tooltip.parentNode.removeChild(tooltip);
+                        }
                         var x = item.datapoint.x.toFixed(2);
                         var y = item.datapoint.y.toFixed(2);
                         if (!item.series.label){
                             item.series.label = 'commits';
+                        }
                         var d = new Date(x*1000);
                         var fd = d.toDateString()
                         var nr_commits = parseInt(y);
                         var cur_data = dataset[item.series.label].data[item.dataIndex];
                         var added = cur_data.added;
                         var changed = cur_data.changed;
                         var removed = cur_data.removed;
                         var nr_commits_suffix = " ${_('commits')} ";
                         var added_suffix = " ${_('files added')} ";
                         var changed_suffix = " ${_('files changed')} ";
                         var removed_suffix = " ${_('files removed')} ";
                         if(nr_commits == 1){nr_commits_suffix = " ${_('commit')} ";}
                         if(added==1){added_suffix=" ${_('file added')} ";}
                         if(changed==1){changed_suffix=" ${_('file changed')} ";}
                         if(removed==1){removed_suffix=" ${_('file removed')} ";}
                         showTooltip(item.pageX, item.pageY, item.series.label + " on " + fd
                                  +'<br/>'+
                                  nr_commits + nr_commits_suffix+'<br/>'+
                                  added + added_suffix +'<br/>'+
                                  changed + changed_suffix + '<br/>'+
                                  removed + removed_suffix + '<br/>');
+                    }
+                }
                 else {
                       var tooltip = YUD.get("tooltip");
                       if(tooltip) {
                             tooltip.parentNode.removeChild(tooltip);
+                      }
                     previousPoint = null;
+                }
+            }
             /**
              * MAIN EXECUTION
              */
             var data = getDataAccordingToRanges(initial_ranges);
             generateCheckboxes(data);
             //main plot
             var plot = YAHOO.widget.Flot(plotContainer,data,plot_options);
             //overview
             var overview = YAHOO.widget.Flot(overviewContainer,
                     overview_dataset, overview_options);
             //show initial selection on overview
             overview.setSelection(initial_ranges);
             plot.subscribe("plotselected", plotselected);
             plot.subscribe("plothover", plothover)
             overview.subscribe("plotselected", function (ranges) {
                 plot.setSelection(ranges);
             });
     // user choices on overview
             YUE.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, initial_ranges]);
+        }
             SummaryPlot(${c.ts_min},${c.ts_max},${c.commit_data|n},${c.overview_data|n});
         </script>
 %endif
 </%def>

0 comments (0 inline, 0 general)