diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb index 4a7061234d6..0a1ce6ff40a 100644 --- a/app/controllers/stats_controller.rb +++ b/app/controllers/stats_controller.rb @@ -9,8 +9,14 @@ def subscriptions end def range - @start = params[:start] ? Time.parse(params[:start]) : Time.now - 1.month - @end = params[:end] ? Time.parse(params[:end]) : Time.now + if params[:options].present? + @start = Time.now - 1.send(params[:options].downcase) + params[:start] = @start + params[:end] = Time.now + end + @start = params[:start] ? Time.parse(params[:start].to_s) : Time.now - 1.month + @end = params[:end] ? Time.parse(params[:end].to_s) : Time.now + @notes = Node.select(%i(created type status)) .where(type: 'note', status: 1, created: @start.to_i..@end.to_i) .count(:all) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 38c3cc28624..008ca0e519d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -57,6 +57,17 @@ I18n.defaultLocale = "<%= I18n.default_locale %>"; I18n.locale = "<%= I18n.locale %>"; I18n.fallbacks = true; + $(function () { + $("[data-toggle=popover]").popover({ + html: true, + content: function() { + return $('#popover-content').html(); + + } + + }); +}) + <% cache('feature_header', skip_digest: true) do %> diff --git a/app/views/stats/range.html.erb b/app/views/stats/range.html.erb index 9e734ebadd3..99d73b37da7 100644 --- a/app/views/stats/range.html.erb +++ b/app/views/stats/range.html.erb @@ -1,36 +1,45 @@