From e7b99d9f0140e2dfd624c8ceed12df56c4f7bf1a Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Tue, 7 Dec 2010 09:52:14 -0500 Subject: [PATCH] Switching to the story view on double-click, and correctly moving back and forth between views automatically. Also cleaned up copy in Add modal and Intelligence Classifier Intro modal. --- media/css/reader.css | 7 +- media/img/reader/sample_classifier_tag.png | Bin 2559 -> 4213 bytes media/js/newsblur/reader.js | 91 ++++++++++++--------- media/js/newsblur/reader_add_feed.js | 8 +- media/js/newsblur/reader_classifier.js | 21 +++-- media/js/newsblur/reader_preferences.js | 21 +++++ templates/reader/feeds.xhtml | 2 +- 7 files changed, 95 insertions(+), 55 deletions(-) diff --git a/media/css/reader.css b/media/css/reader.css index 7cd2d74bb..583c78b30 100644 --- a/media/css/reader.css +++ b/media/css/reader.css @@ -1220,6 +1220,10 @@ background: transparent; position: absolute; } +#story_pane .NB-story-iframe { + left: 200%; +} + /* ================= */ /* = Story Content = */ /* ================= */ @@ -2282,12 +2286,13 @@ a.NB-splash-link:hover { .NB-modal-trainer .NB-trainer-points li { line-height: 23px; margin: 0 0 18px 0; + clear: both; } .NB-modal-trainer .NB-trainer-points li b { display: block; } .NB-modal-trainer .NB-trainer-points li img { - padding: 0 0 50px 28px; + padding: 0 0 0 8px; } .NB-modal-trainer .NB-trainer-points li img.NB-trainer-bullet { diff --git a/media/img/reader/sample_classifier_tag.png b/media/img/reader/sample_classifier_tag.png index ce4b30b5009ccd5feaaea3ef29c393840156873a..642363a980f671293bbc4954c44803a458daa130 100644 GIT binary patch delta 4197 zcmV-r5Ss7*6ZIe=iBL{Q4GJ0x0000DNk~Le0001+0000H2nGNE0Ln_Rh7qo=iGbWeM8MdQbSUi2LdTb zNI(Jzv=J}@>82G}A__DMU4RTWG9!qH(kP9hHY||FW-$Z>n@NI(DPlA-CLx3hsZd3# zQe)n$dc%G1-Qk@6a9<5c6?D6r&T7}<|D{&lbN1Q$?!C`{p6(M`Yt24T#dg&2T2%fW z(0M@YyX6!7%|U~(5%wI6isO;-*8MJl81HP_>&4xDBP#V6I!K}e1>;;%%J8pJ`&-OU z@UcLEkbqHzQF#JZ(@n_e{Qbv%#MyNIUGh7=fX;747zPLvkfR$73HgG;SDK21i62Y| zh@W7;K>$8~p?&_^tfN2&pnR~JvFALDQGWEtFXAK+T5GM`-4wU~9V*|3FyibL&Hy1G z2m*Ewlz}j*uNop|8>mVAO^C4wI38LN?iXN)FglJWmolWCuz$iqAWg80F*W-^Nbmb0 zjgVj(rM+^ZIb07+6J%+@^C1`)txXGr3ZG9P77($2#;&0sfHXqe`2ipyVuW%S#zb<@ z4|$I~_dFPXZ%s2i+x5quSr!ETIDO~ zx?nvrwrC>FM?#b8@1(t>he&w~tp_xZuH=(FY;9}DlNJ(*X+o^L2@}BYxe4vGAMTCRqfl(CrNDKpphBYoe_2q&< znE>?n1jMR5VrH~t9R;EsgbO;46wsHdpg&olsn#c(mpBE16rnYR5ExPt1TG6^jySD< zMi?>h_TY72i9Pp8{<ENu!Sl;@4z>Ub?Y z|F1>PeXy2Uty9pR=1ZqU_~kwCaQr#d+<0Drmw%Mu>Wx$Q^5IoHxlxkqOY+M584f;l zI<<{azI#@N3%}8gJ$)wWzFi!0q{&^E32arwbTyyRs-v`gd7J^I9$@6Gs18@HfD%>HIt2ygT$?11a>}E|>r9_WL zat&Hx&wml4d1&VU%6Cs->tk1q`Ha#8 zfe)sI>2Kk%=_j-NmPavz^s^;LGxxf|VN}*wmSA^(Kwa%LT+hQPy#QY)yg z5MlZtOc7NzaPntCc<|fb!_>vFVg}@0&@Q~Q8?+CdU9e~xSb2E$FHo$7)ki_O3E2#| zfOO&YothafP!Sbjl+)0gRUCiDk=*m+=`h#_(qL(}n@|6wn)wS|?tiq%x%YjU^A6n3 z1*T2v>32DGO*41ieKZGuMTRK0zl%}n^T?B{X?*o*W_?ky`JyI{ioVF!4JL05O6<-C zHgrWes^WG0;<)=9_*5R;%F~Y@&Qzllh;ef5E>>O`(fIj6L9&S_D2 zZ#SR1%IDsDj^Lo$J@me@lj`OKYuBw}@IM}7*_Gv7dT}{(^($M#HM3;18RjKLfQz=o*0K$3vL}Cl9d%#5MR1?qu zM?$(CSch;t0;1r4!U5`Nf7_wxTF-o-7sQlXioO$h;;>fi zh(Qo2Vo?jNeTuF_(e+VkVxCu};$AaWbD2QLZpfNp@oi_Ja}WX%2313cG^T_d@59bP zP!_B>L{JkId)0?BBI)VxVf~veyzs$^WaGy`naAOE{ivd%tkHtxI+T`ZrBGVqDUGi{ zs{ko~1%5Hft=GK98NY~e>tzdRO1wj%P4HklRMlmflH0>m_vINBQ;|9tXBt7ElWh2t z$-14#(-S=bOij}ghoa|lpiv3=KM=SMftCbXqf0sol#gkFGt|d57r)6xkJs??%Ug&S zw&JEGYu1^Rw@9jke%7zqMF)$qw9jzSBr1o0AjpJ8>m=|!pCIs&hJ|66L@Wy-1VTy- zDY5Mc5z8tSo|7D)olv*3j4OU}7gc}wB|o_DCBFa6PnlCWInR$qjtj56k;Py7CTGu1 zglB^_!flMNR#cRiVHpMjg;HwNX_QiD&RAxewv3KSimp8Kg|5fc6R>0!1aG>;`)mgaQ97X*)~*3 zOe*%h#USy0MZCJ1$DdivB?kw5`{6Ah-sa(7YswqydHv}Dl5-ZYXJ-d5elQ!`bVpB6 zzE5;!E06tp1;4s8&C$(mWdH1N#T^xYoO|)1ths9g&+RaY#|0A$Zb_k_m@;EFFT8LP zXUulE?vb|;vF&Vm0X8(&Gx%BuuR3*>y*xL6 z2Nr(g4Q{S)}z>{?zm|U<%fQqgsvJKEqnkjG&N(DgX#y`tL%o3^_twG4sK@o7c1jqzl7rCD2s7%!8Ct9?Of9a2 z);SOt(A^8W`oj)(&h*gXI(wk18e*0xwebO#m!Pe;lGobm*|e*FnT(iC;=pD6@N2c$ zyPsk4Ar@N)52STzGu5&kFD)q4E@SDzHWh_!1imI2EM@tjl{D49#-Vj(tlzMJWBz_Q zC!b%GmV5G}`n$ys7i}-t`Alm3)LH zjX8F{cQ8{9pTn$w_)dbHM=HLAPc5sY(%VAdNixO}9KJ-*JY@?Dts1s;w9<6g0?u4n zLv7(9WN{k}wK<&JV&=3~v+;#trW`Vh>5)!?k<4OLBXl9O8v-c;Y%3h{mL&{|#XRY( zjb&=eqC+&+`&5?s7{(-FO)JdCtB|n+Xj*zG=UjI-jdr+yv|{BKSh;i_b#=8wCL#6Q z6!whed}is~aZl5{)tzMJX)WqxO;iijtPA7?qYN(qFo}$>_h3^gk5Q#~w>c!*-ccZ*M&<4^Bh)q2JqSZhE zMFk?j8|=e%x-cRUq78G=83QNPhA=(iwR3Q@3eV|(z%V7zx&;(cDS|=|iJE#y%mhEc zPY+UbJ^&TqO1Eo z7R^z3li5k-k?|!&7yc1sY?2KhAB5Ig2f5cNwjCD=E@KE`P;>*7@`>68xx5;kw!=um z71$AfIU%b3uY?)lp+D+O0R*6mlPnn^Y{E}6g|G;er7Jr6f2lUn#gK`N0zN2r+!^EM zjVd2@Fe1Wesi6yu8&s9BFE3p(-pKwDUb-~CkR@3?P~OBdM$ah~##)u=OA5ja-}6H> zWn0kE?V*eowBN_fX0=cH6rl2GH1@n_Fe_JoO?uA9iP3MPLFzFI?Oy@yAdJ|k;k9Nj zM;njv-R39Q-`IDAF%gD@?taD8I=RnI0m?yZh|IVXYsy9chjNbNI{sH5LHcFf?kmvQ zzx)r|%un$D8Jh5`jvugh0Mr^0TZq+sGiLQa?l*bFzQ1SFDu)_=4u9wgRDKJn9Q)QR v1fSq<5eh^U8C`%;brMF^DF~x#ze@05RfZrKTc>1 delta 2530 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 diff --git a/media/js/newsblur/reader.js b/media/js/newsblur/reader.js index 1b004bc90..3155567f8 100644 --- a/media/js/newsblur/reader.js +++ b/media/js/newsblur/reader.js @@ -1128,6 +1128,7 @@ 'switching_to_feed_view': false, 'find_next_unread_on_page_of_feed_stories_load': false, 'page_view_showing_feed_view': false, + 'feed_view_showing_story_view': false, 'iframe_fetching_story_locations': false, 'story_titles_loaded': false, 'iframe_prevented_from_loading': false, @@ -1420,7 +1421,6 @@ var $feed_story = this.find_story_in_feed_view(story); var $iframe_story = this.find_story_in_feed_iframe(story); - // if (!this.flags.iframe_view_loaded) { if (!$iframe_story || !$iframe_story.length || !this.flags['story_titles_loaded']) { // If the iframe has not yet loaded, we can't touch it. // So just assume story not found. @@ -1430,6 +1430,9 @@ iframe_position = this.scroll_to_story_in_iframe(story, $iframe_story); this.switch_to_correct_view(iframe_position); feed_position = this.scroll_to_story_in_story_feed(story, $feed_story); + if (this.story_view == 'story') { + this.open_story_in_story_view(story); + } } } else { // User is scrolling the page. Just select in story titles. @@ -1444,28 +1447,35 @@ } } - if (this.story_view == 'story') { + if (this.story_view == 'feed' && this.model.preference('feed_view_single_story')) { // Show the correct story in the feed view. But other views don't need this. this.show_correct_stories_in_page_and_feed_view(); } }, switch_to_correct_view: function(found_story_in_page) { - // NEWSBLUR.log(['Found story', found_story_in_page, this.story_view, this.flags.iframe_view_loaded, this.flags['page_view_showing_feed_view']]); + NEWSBLUR.log(['Found story', found_story_in_page, this.story_view, this.flags.iframe_view_loaded, this.flags['page_view_showing_feed_view'], this.flags['feed_view_showing_story_view']]); if (found_story_in_page === false) { // Story not found, show in feed view with link to page view if (this.story_view == 'page' && !this.flags['page_view_showing_feed_view']) { this.flags['page_view_showing_feed_view'] = true; this.switch_taskbar_view('feed', 'page'); this.show_correct_stories_in_page_and_feed_view(); + } else if (this.flags['feed_view_showing_story_view']) { + this.flags['page_view_showing_feed_view'] = false; + this.flags['feed_view_showing_story_view'] = false; + this.switch_taskbar_view(this.story_view, this.story_view); } } else { - if (this.story_view == 'page' && this.flags['page_view_showing_feed_view']) { - this.flags['page_view_showing_feed_view'] = false; - this.switch_taskbar_view('page'); - } + if (this.story_view == 'page' && this.flags['page_view_showing_feed_view']) { + this.flags['page_view_showing_feed_view'] = false; + this.switch_taskbar_view('page'); + } else if (this.flags['feed_view_showing_story_view']) { + this.flags['page_view_showing_feed_view'] = false; + this.flags['feed_view_showing_story_view'] = false; + this.switch_taskbar_view(this.story_view, this.story_view); + } } - }, scroll_to_story_in_story_feed: function(story, $story, skip_scroll) { @@ -1483,8 +1493,10 @@ // NEWSBLUR.log(['scroll_to_story_in_story_feed', story, $story]); if ($story && $story.length) { - if (skip_scroll || (this.story_view == 'page' - && !this.flags['page_view_showing_feed_view'])) { + if (skip_scroll || + this.story_view == 'story' || + (this.story_view == 'page' && + !this.flags['page_view_showing_feed_view'])) { $feed_view.scrollTo($story, 0, { axis: 'y', offset: 0 }); // Do this at view switch instead. } else if (this.story_view == 'feed' || this.flags['page_view_showing_feed_view']) { @@ -2443,16 +2455,16 @@ this.model.view_setting(this.active_feed, view); } - $page_to_feed_arrow.hide(); $feed_to_story_arrow.hide(); this.flags['page_view_showing_feed_view'] = false; + this.flags['page_view_showing_feed_view'] = false; if (skip_save_type == 'page') { $page_to_feed_arrow.show(); this.flags['page_view_showing_feed_view'] = true; } else if (skip_save_type == 'story') { $feed_to_story_arrow.show(); - this.flags['page_view_showing_feed_view'] = true; // FIXME + this.flags['feed_view_showing_story_view'] = true; } else { $taskbar_buttons.removeClass('NB-active'); $('.task_button_view.task_view_'+view).addClass('NB-active'); @@ -2476,7 +2488,7 @@ 'left': 0 }, { 'easing': 'easeInOutQuint', - 'duration': 750, + 'duration': 550, 'queue': false }); } else if (view == 'feed') { @@ -2489,7 +2501,7 @@ 'left': -1 * $feed_iframe.width() }, { 'easing': 'easeInOutQuint', - 'duration': 750, + 'duration': 550, 'queue': false }); @@ -2506,10 +2518,10 @@ } } else if (view == 'story') { $story_pane.animate({ - 'left': -1 * $feed_iframe.width() + 'left': -2 * $feed_iframe.width() }, { 'easing': 'easeInOutQuint', - 'duration': 750, + 'duration': 550, 'queue': false }); @@ -2553,35 +2565,32 @@ // NEWSBLUR.log(['Showing feed view', this.story_view, this.flags['page_view_showing_feed_view']]); if (this.story_view == 'page' && this.flags['page_view_showing_feed_view']) { - this.show_correct_story_titles_in_unread_view({'animate': false}); + } else if (this.story_view == 'feed') { - $stories.removeClass('NB-feed-view-story').addClass('NB-feed-view-feed'); - this.show_correct_story_titles_in_unread_view({'animate': false}); - } else if (this.story_view == 'story') { - $stories.removeClass('NB-feed-view-feed').addClass('NB-feed-view-story'); - var $current_story = this.get_current_story_from_story_titles(); - $feed_view_stories.css({'display': 'none'}); - $feed_view.scrollTop('0px'); - if ($current_story && $current_story.length) { - $current_story.css({'display': 'block'}); + if (this.model.preference('feed_view_single_story')) { + $stories.removeClass('NB-feed-view-feed').addClass('NB-feed-view-story'); + $feed_view_stories.css({'display': 'none'}); + $feed_view.scrollTop('0px'); + var $current_story = this.get_current_story_from_story_titles(); + if ($current_story && $current_story.length) { + $current_story.css({'display': 'block'}); + } + } else { + $stories.removeClass('NB-feed-view-story').addClass('NB-feed-view-feed'); } + } else if (this.story_view == 'story') { + } + this.show_correct_story_titles_in_unread_view({'animate': false}); }, // ============== // = Story View = // ============== - open_story_in_story_view: function(story, $story_title) { - this.switch_taskbar_view('story'); - - }, - - - unload_story_iframe: function() { - var $story_iframe = this.$s.$story_iframe; - - $story_iframe.removeAttr('src'); + open_story_in_story_view: function(story, is_temporary) { + this.switch_taskbar_view('story', is_temporary ? 'story' : false); + this.load_story_iframe(story, story.story_feed_id); }, load_story_iframe: function(story, feed_id) { @@ -2589,6 +2598,7 @@ var self = this; var $story_iframe = this.$s.$story_iframe; + NEWSBLUR.log(['load_story_iframe', story.story_permalink, $story_iframe]); this.unload_story_iframe(); if (!feed_id) { @@ -2599,10 +2609,15 @@ this.flags.iframe_scroll_snap_back_prepared = true; this.iframe_link_attacher_num_links = 0; - $story_iframe.removeAttr('src').attr({src: story.story_permalink}); }, + unload_story_iframe: function() { + var $story_iframe = this.$s.$story_iframe; + + $story_iframe.removeAttr('src'); + }, + // =================== // = Taskbar - Feeds = // =================== @@ -3995,7 +4010,7 @@ // NEWSBLUR.log(['Story dblclick', $t]); var story_id = $('.story_id', $t).text(); var story = self.model.get_story(story_id); - self.open_story_in_story_view(story, $t); + self.open_story_in_story_view(story, true); }); $.targetIs(e, { tagSelector: '#feed_list .feed' }, function($t, $p){ e.preventDefault(); diff --git a/media/js/newsblur/reader_add_feed.js b/media/js/newsblur/reader_add_feed.js index 77bd81555..11ae8e6d6 100644 --- a/media/js/newsblur/reader_add_feed.js +++ b/media/js/newsblur/reader_add_feed.js @@ -64,10 +64,10 @@ NEWSBLUR.ReaderAddFeed.prototype = { 'Import from Google Reader', $.make('img', { className: 'NB-add-google-reader-arrow', src: NEWSBLUR.Globals['MEDIA_URL']+'img/icons/silk/arrow_right.png' }) ]), - $.make('div', { className: 'NB-add-danger' }, [ + (this.model.feeds.length && $.make('div', { className: 'NB-add-danger' }, [ $.make('img', { src: NEWSBLUR.Globals['MEDIA_URL']+'img/icons/silk/server_go.png' }), 'This will erase all existing feeds and folders.' - ]) + ])) ]) ]), $.make('div', { className: 'NB-fieldset NB-add-opml NB-modal-submit' }, [ @@ -82,10 +82,10 @@ NEWSBLUR.ReaderAddFeed.prototype = { return false; }) ]), - $.make('div', { className: 'NB-add-danger' }, [ + (this.model.feeds.length && $.make('div', { className: 'NB-add-danger' }, [ $.make('img', { src: NEWSBLUR.Globals['MEDIA_URL']+'img/icons/silk/server_go.png' }), 'This will erase all existing feeds and folders.' - ]), + ])), $.make('div', { className: 'NB-error' }) ]) ]) diff --git a/media/js/newsblur/reader_classifier.js b/media/js/newsblur/reader_classifier.js index 5fe1c1581..26401db79 100644 --- a/media/js/newsblur/reader_classifier.js +++ b/media/js/newsblur/reader_classifier.js @@ -254,33 +254,32 @@ var classifier_prototype = { $.make('h3', { className: 'NB-modal-subtitle' }, 'Here\'s what to do:'), $.make('ol', { className: 'NB-trainer-points' }, [ $.make('li', [ - $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/sample_classifier_tag.png', style: 'float: right', width: 135, height: 20 }), + $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/sample_classifier_tag.png', style: 'float: right;margin-top: 4px;', width: 155, height: 17 }), $.make('b', 'You will see a bunch of tags and authors.'), - ' Check the features you want to see in stories. If you check too many options, you won\'t find the good among the neutral.' + ' Click on what you like and don\'t like.' ]), $.make('li', [ $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/intelligence_slider_positive.png', style: 'float: right', width: 114, height: 29 }), - $.make('b', 'What you select now will show when you use the intelligence slider.'), - $.make('img', { className: 'NB-trainer-bullet', src: NEWSBLUR.Globals.MEDIA_URL + '/img/icons/silk/bullet_red.png'}), - ' are stories you don\'t like', + $.make('b', 'The intelligence slider filters stories.'), + $.make('img', { className: 'NB-trainer-bullet', src: NEWSBLUR.Globals.MEDIA_URL + '/img/icons/silk/bullet_green.png'}), + ' are stories you like', $.make('br'), $.make('img', { className: 'NB-trainer-bullet', src: NEWSBLUR.Globals.MEDIA_URL + '/img/icons/silk/bullet_yellow.png'}), ' are stories you have not yet rated', $.make('br'), - $.make('img', { className: 'NB-trainer-bullet', src: NEWSBLUR.Globals.MEDIA_URL + '/img/icons/silk/bullet_green.png'}), - ' are stories you like' + $.make('img', { className: 'NB-trainer-bullet', src: NEWSBLUR.Globals.MEDIA_URL + '/img/icons/silk/bullet_red.png'}), + ' are stories you don\'t like' ]), $.make('li', [ - $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/sample_menu.png', style: 'float: right', width: 176, height: 118 }), + // $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/sample_menu.png', style: 'float: right', width: 176, height: 118 }), $.make('b', 'Stop at any time you like.'), ' You can always come back to this.' ]), $.make('li', [ $.make('b', 'Don\'t worry if you don\'t know what you like right now.'), ' Just skip the site. You can click the ', - $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/thumbs_up.png', style: 'vertical-align: middle;padding: 0 8px 0 2px', width: 14, height: 20 }), - $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/thumbs_down.png', style: 'vertical-align: top; padding: 0', width: 14, height: 20 }), - ' buttons as you read stories.' + $.make('img', { src: NEWSBLUR.Globals.MEDIA_URL + '/img/reader/thumbs_up.png', style: 'vertical-align: middle;padding: 0 2px', width: 14, height: 20 }), + ' button as you read stories.' ]) ]), (!NEWSBLUR.Globals.is_authenticated && $.make('div', { className: 'NB-trainer-not-authenticated' }, 'Please create an account and add sites you read. Then you can train them.')), diff --git a/media/js/newsblur/reader_preferences.js b/media/js/newsblur/reader_preferences.js index abcd2533d..b2123dc96 100644 --- a/media/js/newsblur/reader_preferences.js +++ b/media/js/newsblur/reader_preferences.js @@ -190,6 +190,21 @@ NEWSBLUR.ReaderPreferences.prototype = { 'Site sidebar' ]) ]), + $.make('div', { className: 'NB-preference NB-preference-singlestory' }, [ + $.make('div', { className: 'NB-preference-options' }, [ + $.make('div', [ + $.make('input', { id: 'NB-preference-singlestory-1', type: 'radio', name: 'feed_view_single_story', value: 0 }), + $.make('label', { 'for': 'NB-preference-singlestory-1' }, 'Show everything') + ]), + $.make('div', [ + $.make('input', { id: 'NB-preference-singlestory-2', type: 'radio', name: 'feed_view_single_story', value: 1 }), + $.make('label', { 'for': 'NB-preference-singlestory-2' }, 'Hide sites with no unread stories') + ]) + ]), + $.make('div', { className: 'NB-preference-label'}, [ + 'Site sidebar' + ]) + ]), $.make('div', { className: 'NB-preference NB-preference-story-styling' }, [ $.make('div', { className: 'NB-preference-options' }, [ $.make('div', [ @@ -290,6 +305,12 @@ NEWSBLUR.ReaderPreferences.prototype = { return false; } }); + $('input[name=feed_view_single_story]', this.$modal).each(function() { + if ($(this).val() == NEWSBLUR.Preferences.feed_view_single_story) { + $(this).attr('checked', true); + return false; + } + }); $('input[name=story_styling]', this.$modal).each(function() { if ($(this).val() == NEWSBLUR.Preferences.story_styling) { $(this).attr('checked', true); diff --git a/templates/reader/feeds.xhtml b/templates/reader/feeds.xhtml index b9672e020..c5042e9f3 100644 --- a/templates/reader/feeds.xhtml +++ b/templates/reader/feeds.xhtml @@ -402,7 +402,7 @@ $(document).ready(function() {
  • Feed -
    +
  • Story