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
@@ -7,7 +7,7 @@
<%def name="breadcrumbs_links()">
${h.link_to(u'Home',h.url('/'))}
»
- ${h.link_to(c.repo_name,h.url('summary_home',repo_name=c.repo_name))}
+ ${h.link_to(c.dbrepo.just_name,h.url('summary_home',repo_name=c.repo_name))}
»
${_('summary')}
@@ -24,48 +24,65 @@
@@ -99,8 +114,11 @@
- ${h.age(c.repo_info.last_change)} - ${c.repo_info.last_change}
- ${_('by')} ${h.get_changeset_safe(c.repo_info,'tip').author}
+ ${'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)}
+ ${_('by')} ${h.get_changeset_safe(c.rhodecode_repo,'tip').author}
@@ -110,7 +128,7 @@
-
+
@@ -119,96 +137,7 @@
@@ -217,14 +146,28 @@
- %for cnt,archive in enumerate(c.repo_info._get_archives()):
- %if cnt >=1:
- |
- %endif
- ${h.link_to(archive['type'],
- h.url('files_archive_home',repo_name=c.repo_info.name,
- revision='tip',fileformat=archive['extension']),class_="archive_icon")}
- %endfor
+ %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'):
+ [${h.link_to(_('enable'),h.url('edit_repo',repo_name=c.repo_name))}]
+ %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
+ ${h.link_to(archive['type'],
+ h.url('files_archive_home',repo_name=c.dbrepo.repo_name,
+ fname='tip'+archive['extension']),class_="archive_icon")}
+ %endfor
+
+ ${_('with subrepos')}
+
+ %endif
@@ -233,12 +176,134 @@
- ${h.link_to(_('RSS'),h.url('rss_feed_home',repo_name=c.repo_info.name),class_='rss_icon')}
- ${h.link_to(_('Atom'),h.url('atom_feed_home',repo_name=c.repo_info.name),class_='atom_icon')}
+ %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
-
+
+
@@ -248,10 +313,17 @@
-
+
%if c.no_data:
-
${c.no_data_msg}
- %endif:
+ ${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))}]
+ %endif
+
+ %else:
+ ${_('Loaded in')} ${c.stats_percentage} %
+ %endif
+
@@ -384,43 +456,33 @@
function getDataAccordingToRanges(ranges) {
var data = [];
+ var new_dataset = {};
var keys = [];
+ var max_commits = 0;
for(var key in dataset){
- var push = false;
- //method1 slow !!
- //*
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){
- push = true;
- break;
+
+ if(new_dataset[key] === undefined){
+ new_dataset[key] = {data:[],schema:["commits"],label:key};
+ }
+ new_dataset[key].data.push(commit_data);
}
}
- //*/
-
- /*//method2 sorted commit data !!!
-
- var first_commit = dataset[key].data[0].time;
- var last_commit = dataset[key].data[dataset[key].data.length-1].time;
-
- if (first_commit >= ranges.xaxis.from && last_commit <= ranges.xaxis.to){
- push = true;
- }
- //*/
-
- if(push){
- data.push(dataset[key]);
- }
+ if (new_dataset[key] !== undefined){
+ data.push(new_dataset[key]);
+ }
}
- if(data.length >= 1){
- return data;
- }
+
+ if (data.length > 0){
+ return data;
+ }
else{
//just return dummy data for graph to plot itself
return [getDummyData('')];
}
-
}
/**
@@ -469,7 +531,7 @@
//resubscribe plothover
plot.subscribe("plothover", plothover);
- // don't fire event on the overview to prevent eternal loop
+ // don't fire event on the overview to prevent eternal loop
overview.setSelection(cur_ranges, true);
}
@@ -481,7 +543,7 @@
*/
function plotselected(ranges,cur_data) {
//updates the data for new plot
- data = getDataAccordingToRanges(ranges);
+ var data = getDataAccordingToRanges(ranges);
generateCheckboxes(data);
var new_options = YAHOO.lang.merge(plot_options, {
@@ -491,13 +553,8 @@
mode:"time",
timeformat: "%d/%m",
},
- yaxis: {
- min: ranges.yaxis.from,
- max: ranges.yaxis.to,
- },
-
});
- // do the zooming
+ // do the zooming
plot = YAHOO.widget.Flot(plotContainer, data, new_options);
plot.subscribe("plotselected", plotselected);
@@ -508,7 +565,7 @@
// don't fire event on the overview to prevent eternal loop
overview.setSelection(ranges, true);
- //resubscribe choiced
+ //resubscribe choiced
YUE.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, ranges]);
}
@@ -576,25 +633,25 @@
* MAIN EXECUTION
*/
- var data = getDataAccordingToRanges(initial_ranges);
+ var data = getDataAccordingToRanges(initial_ranges);
generateCheckboxes(data);
- //main plot
+ //main plot
var plot = YAHOO.widget.Flot(plotContainer,data,plot_options);
- //overview
- var overview = YAHOO.widget.Flot(overviewContainer, overview_dataset, overview_options);
+ //overview
+ var overview = YAHOO.widget.Flot(overviewContainer,
+ overview_dataset, overview_options);
- //show initial selection on overview
+ //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);
});
-
- plot.subscribe("plothover", plothover);
YUE.on(choiceContainer.getElementsByTagName("input"), "click", plotchoiced, [data, initial_ranges]);
}
%endif
- %if c.repo_info.dbrepo.repo_type =='git':
+ %if c.dbrepo.repo_type =='git':
})
+ })