moved public timeline

app/views/layouts/_header.html.haml

@@ -23,8 +23,6 @@
           = nav_entry "Timeline", root_path
         %ul.nav.navbar-nav
           = nav_entry "Inbox", "/inbox", badge: inbox_count
-        %ul.nav.navbar-nav
-          = nav_entry "Public", public_timeline_path
         %ul.nav.navbar-nav.navbar-right
           %button.btn.btn-primary.navbar-btn.btn-sm{"data-target" => "#modal-ask-followers", "data-toggle" => "modal", :type => "button"}
             %i.fa.fa-pencil-square-o

app/views/public/index.html.haml

@@ -1,9 +1,44 @@
 .container.j2-page
-  .col-md-3.col-sm-3.hidden-xs
+  .col-md-3.col-sm-3
-    .panel.panel-default
+    .panel.panel-default.hidden-xs
       .panel-body
         %p
-          You are viewing the public timeline.
+          Welcome,
+          = current_user.screen_name
+        - unless inbox_count.nil?
+          %p
+            %strong
+              You have
+              = pluralize(inbox_count, 'new question')
+              in your inbox!
+        .row
+          %a{href: show_user_followers_path(current_user.screen_name)}
+            .col-md-6.col-sm-6.col-xs-6
+              %h4.entry-text#follower-count= current_user.follower_count
+              %h6.entry-subtext Followers
+          %a{href: show_user_friends_path(current_user.screen_name)}
+            .col-md-6.col-sm-6.col-xs-6
+              %h4.entry-text#friend-count= current_user.friend_count
+              %h6.entry-subtext Following
+        .row
+          .col-md-6.col-sm-6.col-xs-6
+            %h4.entry-text#asked-count= current_user.asked_count
+            %h6.entry-subtext Questions
+          .col-md-6.col-sm-6.col-xs-6
+            %h4.entry-text#answered-count= current_user.answered_count
+            %h6.entry-subtext Answers
+        .row
+          .col-md-6.col-sm-6.col-xs-6
+            %h4.entry-text#asked-count= current_user.commented_count
+            %h6.entry-subtext Comments
+          .col-md-6.col-sm-6.col-xs-6
+            %h4.entry-text#answered-count= current_user.smiled_count
+            %h6.entry-subtext Smiles
+    .panel.panel-default
+      .panel-body
+        %ul.nav.nav-pills.nav-stacked
+          = nav_entry "Timeline", root_path
+          = nav_entry "Public", public_timeline_path
     = render 'shared/links'
   .col-md-9.col-xs-12.col-sm-9
     = render 'layouts/messages'

app/views/static/index.html.haml

@@ -1,7 +1,7 @@
 - if user_signed_in?
   .container.j2-page
-    .col-md-3.col-sm-3.hidden-xs
+    .col-md-3.col-sm-3
-      .panel.panel-default
+      .panel.panel-default.hidden-xs
         .panel-body
           %p
             Welcome,
@@ -35,6 +35,11 @@
             .col-md-6.col-sm-6.col-xs-6
               %h4.entry-text#answered-count= current_user.smiled_count
               %h6.entry-subtext Smiles
+      .panel.panel-default
+        .panel-body
+          %ul.nav.nav-pills.nav-stacked
+            = nav_entry "Timeline", root_path
+            = nav_entry "Public", public_timeline_path
       = render 'shared/links'
     .col-md-9.col-xs-12.col-sm-9
       = render 'layouts/messages'