Merge branch 'master' of git.rrerr.net:nilsding/justask

app/controllers/static_controller.rb

@@ -3,6 +3,6 @@ class StaticController < ApplicationController
   end
 
   def about
-    @admins = User.where(admin: true)
+    @admins = User.where(admin: true).order(:id)
   end
 end

app/views/layouts/application.html.haml

@@ -1,10 +1,12 @@
 !!! 5
 %html
   %head
-    %meta{content: '#0C84E4', name: 'theme-color'}
     %meta{charset: 'utf-8'}
     %meta{'http-equiv' => 'X-UA-Compatible' ,content: 'IE=edge'}
-    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1'}
+    %meta{name: 'viewport', content: 'width=device-width, initial-scale=1, user-scalable=no'}
+    %meta{name: 'theme-color', content: '#0C84E4'}
+    %meta{name: "apple-mobile-web-app-capable", content: "yes"}
+    %meta{name: "apple-mobile-web-app-status-bar-style", content: "default"}
     %title= APP_CONFIG['site_name']
     = stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true
     = javascript_include_tag 'application', 'data-turbolinks-track' => true

app/views/static/about.html.haml

@@ -20,6 +20,21 @@
             - @admins.each do |user|
               %li
                 %a= link_to user.screen_name, show_user_profile_path(user.screen_name)
+      .panel.panel-default
+        .panel-body
+          There are lies, damned lies, and then there are...
+          %h3 Statistics
+          .row
+            .col-xs-6
+              %h4.entry-text#asked-count= Question.count
+              %h6.entry-subtext Questions
+            .col-md-6.col-sm-6.col-xs-6
+              %h4.entry-text#answered-count= Answer.count
+              %h6.entry-subtext Answers
+          .row
+            .col-xs-6
+              %h4.entry-text#follower-count= User.count
+              %h6.entry-subtext Users
     .col-sm-4
       .panel.panel-default
         .panel-body