diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb index ccd6cdae7..a3957ebda 100644 --- a/app/controllers/about_controller.rb +++ b/app/controllers/about_controller.rb @@ -1,12 +1,22 @@ require_dependency 'rate_limiter' class AboutController < ApplicationController - skip_before_filter :check_xhr, only: [:show] + skip_before_filter :check_xhr, only: [:index] before_filter :ensure_logged_in, only: [:live_post_counts] def index @about = About.new - render_serialized(@about, AboutSerializer) + + respond_to do |format| + format.html do + # @list = list + # store_preloaded(list.preload_key, MultiJson.dump(TopicListSerializer.new(list, scope: guardian))) + render :index + end + format.json do + render_serialized(@about, AboutSerializer) + end + end end def live_post_counts diff --git a/app/views/about/index.html.erb b/app/views/about/index.html.erb new file mode 100644 index 000000000..d13b4e786 --- /dev/null +++ b/app/views/about/index.html.erb @@ -0,0 +1,100 @@ +<% content_for :title do %><%=t "about" %><% end %> + +
+

+ <%=t "js.about.title", {title: @about.title} %> +

+ +
+ <%= @about.description %> +
+ +

<%=t "js.about.our_admins" %>

+ +
+ <% @about.admins.each do |user| %> +
+ + + + + + + <%= user.username %> + <% if user.name.present? %> + - <%= user.name %> + <% end %> + + +
+ <% end %> +
+ + <% if @about.moderators.count > 0 %> +

<%=t "js.about.our_moderators" %>

+
+ <% @about.moderators.each do |user| %> +
+ + + + + + + <%= user.username %> + <% if user.name.present? %> + - <%= user.name %> + <% end %> + + +
+ <% end %> +
+ <% end %> + +
+

<%=t 'js.about.stats' %>

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 <%=t 'js.about.stat.all_time' %><%=t 'js.about.stat.last_7_days' %><%=t 'js.about.stat.last_30_days' %>
<%=t 'js.about.topic_count' %><%= @about.stats[:topic_count] %><%= @about.stats[:topics_7_days] %><%= @about.stats[:topics_30_days] %>
<%=t 'js.about.post_count' %><%= @about.stats[:post_count] %><%= @about.stats[:posts_7_days] %><%= @about.stats[:posts_30_days] %>
<%=t 'js.about.user_count' %><%= @about.stats[:user_count] %><%= @about.stats[:users_7_days] %><%= @about.stats[:users_30_days] %>
<%=t 'js.about.active_user_count' %><%= @about.stats[:active_users_7_days] %><%= @about.stats[:active_users_30_days] %>
<%=t 'js.about.like_count' %><%= @about.stats[:like_count] %><%= @about.stats[:likes_7_days] %><%= @about.stats[:likes_30_days] %>
+
+ +
+
+
\ No newline at end of file diff --git a/app/views/layouts/crawler.html.erb b/app/views/layouts/crawler.html.erb index a68cfade2..732043da7 100644 --- a/app/views/layouts/crawler.html.erb +++ b/app/views/layouts/crawler.html.erb @@ -19,7 +19,7 @@ <%= SiteCustomization.custom_header(session[:preview_style], mobile_view? ? :mobile : :desktop) %> <%- end %>
- "> + ">
<%= yield %>