diff --git a/app/assets/javascripts/admin.js b/app/assets/javascripts/admin.js index b525bdc1f..caee16ffc 100644 --- a/app/assets/javascripts/admin.js +++ b/app/assets/javascripts/admin.js @@ -1,7 +1,7 @@ var AdminDashboard = { init: function() { $('input[name="radio"]').attr("autocomplete", "off"); - $('.account').hide().filter('#three_months').show(); + $('.account_admin_view').hide().filter('#three_months').show(); $('input[name="options"]').change( function() { AdminDashboard.update_chart($('input[name="radio"]').filter(':checked').val()); }) @@ -12,12 +12,12 @@ var AdminDashboard = { update_chart: function(filter) { if(filter == 'weekly') { var contClass = $('input[name="options"]').filter(':checked').data('div'); - $('.account').hide().filter('#' + contClass).show(); + $('.account_admin_view').hide().filter('#' + contClass).show(); } else if(filter == 'monthly'){ var contClass = $('input[name="options"]').filter(':checked').data('div'); - $('.account').hide().filter('#' + contClass + '_monthly').show(); + $('.account_admin_view').hide().filter('#' + contClass + '_monthly').show(); } } } -setTimeout("AdminDashboard.init()", 900); \ No newline at end of file +setTimeout("AdminDashboard.init()", 900); diff --git a/app/helpers/stacks_helper.rb b/app/helpers/stacks_helper.rb index 46c9a76f0..b52b36520 100644 --- a/app/helpers/stacks_helper.rb +++ b/app/helpers/stacks_helper.rb @@ -16,6 +16,6 @@ def stack_similar_project_list(projects) def stack_country_flag(code) return '' unless code && code.size == 2 - haml_tag 'img', src: "/assets/flags/#{code.downcase}.gif" + haml_tag 'img', src: asset_url("flags/#{code.downcase}.gif") end end diff --git a/app/views/oh_admin/dashboard/_accounts_trend_graph.html.haml b/app/views/oh_admin/dashboard/_accounts_trend_graph.html.haml index a9da5ff50..f8ae69940 100644 --- a/app/views/oh_admin/dashboard/_accounts_trend_graph.html.haml +++ b/app/views/oh_admin/dashboard/_accounts_trend_graph.html.haml @@ -1,26 +1,26 @@ :ruby chart_path = charts_oh_admin_accounts_path.to_s -#three_months.account +#three_months.account_admin_view %h1 3 Months Accounts Creation Trend .chart{ 'datasrc' => chart_path + '?period=3' + '&filter_by=weekly' } -#six_months.account +#six_months.account_admin_view %h1 6 Months Accounts Creation Trend .chart{ 'datasrc' => chart_path + '?period=6' + '&filter_by=weekly'} -#one_year.account +#one_year.account_admin_view %h1 1 Year Accounts Creation Trend .chart{ 'datasrc' => chart_path + '?period=12' + '&filter_by=weekly'} -#three_months_monthly.account +#three_months_monthly.account_admin_view %h1 3 Months Accounts Creation Trend .chart{ 'datasrc' => chart_path + '?period=3' + '&filter_by=monthly'} -#six_months_monthly.account +#six_months_monthly.account_admin_view %h1 6 Months Accounts Creation Trend .chart{ 'datasrc' => chart_path + '?period=6' + '&filter_by=monthly'} -#one_year_monthly.account +#one_year_monthly.account_admin_view %h1 1 Year Accounts Creation Trend .chart{ 'datasrc' => chart_path + '?period=12' + '&filter_by=monthly'}