moved public timeline

This commit is contained in:
pixeldesu 2014-12-12 17:43:32 +01:00
parent 21282961b3
commit 7c9df66ae7
3 changed files with 45 additions and 7 deletions

View File

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

View File

@ -1,9 +1,44 @@
.container.j2-page .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 .panel-body
%p %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' = render 'shared/links'
.col-md-9.col-xs-12.col-sm-9 .col-md-9.col-xs-12.col-sm-9
= render 'layouts/messages' = render 'layouts/messages'

View File

@ -1,7 +1,7 @@
- if user_signed_in? - if user_signed_in?
.container.j2-page .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 .panel-body
%p %p
Welcome, Welcome,
@ -35,6 +35,11 @@
.col-md-6.col-sm-6.col-xs-6 .col-md-6.col-sm-6.col-xs-6
%h4.entry-text#answered-count= current_user.smiled_count %h4.entry-text#answered-count= current_user.smiled_count
%h6.entry-subtext Smiles %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' = render 'shared/links'
.col-md-9.col-xs-12.col-sm-9 .col-md-9.col-xs-12.col-sm-9
= render 'layouts/messages' = render 'layouts/messages'