diff --git a/rhodecode/controllers/summary.py b/rhodecode/controllers/summary.py --- a/rhodecode/controllers/summary.py +++ b/rhodecode/controllers/summary.py @@ -88,18 +88,18 @@ class SummaryController(BaseRepoControll 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, + + 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]: @@ -124,9 +124,11 @@ class SummaryController(BaseRepoControll 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 diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -993,7 +993,7 @@ div.options a { 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 diff --git a/rhodecode/templates/summary/summary.html b/rhodecode/templates/summary/summary.html --- a/rhodecode/templates/summary/summary.html +++ b/rhodecode/templates/summary/summary.html @@ -17,7 +17,11 @@ <%def name="main()"> -
+ %if c.show_stats: +
+ %else: +
+ %endif
${self.breadcrumbs()} @@ -30,7 +34,16 @@
-
+
+
+ %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 +
%if c.rhodecode_user.username != 'default': %if c.following: %endif - %endif: - + %endif: ##REPO TYPE %if c.dbrepo.repo_type =='hg': ${_('Mercurial repository')} @@ -84,14 +96,14 @@
-
${h.urlify_text(c.dbrepo.description)}
+
${h.urlify_text(c.dbrepo.description)}
-
+
gravatar
@@ -105,11 +117,11 @@
-
+
${'r%s:%s' % (h.get_changeset_safe(c.rhodecode_repo,'tip').revision, h.get_changeset_safe(c.rhodecode_repo,'tip').short_id)} - - ${h.age(c.rhodecode_repo.last_change)}
+ ${h.age(c.rhodecode_repo.last_change)} ${_('by')} ${h.get_changeset_safe(c.rhodecode_repo,'tip').author}
@@ -118,8 +130,8 @@
-
- +
+
@@ -127,8 +139,14 @@
-
-
+
+ %if c.show_stats: +
+ %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
@@ -136,12 +154,12 @@
-
+
%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: @@ -160,26 +178,12 @@ %endif
-
- -
-
- -
-
- %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 -
-
+
- + +%if c.show_stats:
@@ -209,6 +213,7 @@
+%endif
@@ -235,444 +240,440 @@ %endif +%if c.show_stats: + + - + // 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}); + +%endif