diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb index 7dd8a8df6..d6ea8e217 100644 --- a/app/controllers/admins_controller.rb +++ b/app/controllers/admins_controller.rb @@ -36,7 +36,7 @@ class AdminsController < ApplicationController end def stats - @popular_tags = ActsAsTaggableOn::Tagging.joins(:tag).limit(15).count(:group => :tag, :order => 'count(taggings.id) DESC') + @popular_tags = ActsAsTaggableOn::Tagging.joins(:tag).limit(50).count(:group => :tag, :order => 'count(taggings.id) DESC') case params[:range] when "week" diff --git a/app/views/admins/stats.html.haml b/app/views/admins/stats.html.haml index 17ae0f654..66a87413c 100644 --- a/app/views/admins/stats.html.haml +++ b/app/views/admins/stats.html.haml @@ -49,8 +49,6 @@ %span.percent_change{:class => (model[:change] > 0 ? "green" : "red")} = "(#{model[:change]}%)" - %br - %br %br %br %br @@ -65,63 +63,12 @@ %b #{@posts[:day_before]/@user_count.to_f} - /%h3 - / Posts over time - - /#stats_graph{:style => "text-align:right;position:relative;vertical-align:bottom;background-color:#eee;"} - / = @posts_per_day.inspect - / /- @posts_per_day.each do |key, val| - / /.asdo{:style => "display:inline-block;width:35px;vertical-align:bottom;background-color:#666;height:#{(val/@most_posts_within)*200}px;"} - - - %br - %br - %br - %br - - - -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br -%br - .span-24.last - %h2 - Misc Stuff - %br - %br - %h3 - = for tg in @popular_tags - = link_to tg, tags_path(tg) - -%br -%br - -.span-12 - %h3 - New public posts - /.stream - / /= render 'shared/stream', :posts => @new_public_posts - -.span-12.last - %h3 - Most Liked - .stream - = render 'shared/stream', :posts => @most_liked_posts + 50 Most Popular Tags + - @popular_tags.each do |name,count| + Tag Name: + %b= name + Count: + %b= count + %br diff --git a/app/views/admins/user_search.html.haml b/app/views/admins/user_search.html.haml index 900e78ee7..ff74732ff 100644 --- a/app/views/admins/user_search.html.haml +++ b/app/views/admins/user_search.html.haml @@ -21,7 +21,7 @@ email: = text_field_tag 'user[email]', params[:user][:email] - invitation identifier + invitation identifier: = text_field_tag 'user[invitation_identifier]', params[:user][:invitation_identifier] invitation token: diff --git a/app/views/admins/weekly_user_stats.haml b/app/views/admins/weekly_user_stats.haml index 621798d85..6816c324e 100644 --- a/app/views/admins/weekly_user_stats.haml +++ b/app/views/admins/weekly_user_stats.haml @@ -5,9 +5,9 @@ %br .span-24.last - %h1 + %h2 = "Users per week (Current server date is: #{Time.now.to_date}) " %ul - - @created_users_by_week.keys.sort.each do |k| + - @created_users_by_week.keys.sort.reverse.each do |k| %li - = "Week stating on #{k} , #{@created_users_by_week[k]}" + = "Week starting on #{k} , #{@created_users_by_week[k]}"