adding in refresh on sharing item

2025-09-18 21:43:31 +00:00 · 2012-06-25 20:28:07 -07:00 · 2012-06-25 20:28:07 -07:00 · 04e363c1ec
commit 04e363c1ec
parent 38ecb4cd4e
10 changed files with 438 additions and 166 deletions
--- a/media/iphone/Classes/NewsBlurAppDelegate.h
+++ b/media/iphone/Classes/NewsBlurAppDelegate.h
@ -159,7 +159,7 @@
 - (void)hideStoryDetailView;
 - (void)showShareView:(NSString *)userId setUsername:(NSString *)username;
 - (void)hideShareView;
- (BOOL)isSocialFeed;
+- (void)refreshComments;

 - (int)indexOfNextStory;
 - (int)indexOfPreviousStory;
--- a/media/iphone/Classes/NewsBlurAppDelegate.m
+++ b/media/iphone/Classes/NewsBlurAppDelegate.m
@ -397,6 +397,10 @@
    
 }

+- (void)refreshComments {
+    [storyDetailViewController refreshComments];
+}
+
 - (void)loadRiverFeedDetailView {
    [self setStories:nil];
    [self setFeedUserProfiles:nil];
--- a/media/iphone/Classes/ShareViewController.m
+++ b/media/iphone/Classes/ShareViewController.m
@ -11,6 +11,7 @@
 #import "StoryDetailViewController.h"
 #import <QuartzCore/QuartzCore.h>
 #import "Utilities.h"
+#import "JSON.h"
 #import "ASIHTTPRequest.h"

@implementation ShareViewController
@ -200,6 +201,13 @@
    NSLog(@"Successfully added.");
    [commentField resignFirstResponder];
    [appDelegate hideShareView];
+    
+    NSString *responseString = [request responseString];
+    NSDictionary *results = [[NSDictionary alloc] 
+                             initWithDictionary:[responseString JSONValue]];
+    appDelegate.activeStory = [results objectForKey:@"story"];
+    [results release];
+    [appDelegate refreshComments];
 }

 - (void)requestFailed:(ASIHTTPRequest *)request {
--- a/media/iphone/Classes/StoryDetailViewController.h
+++ b/media/iphone/Classes/StoryDetailViewController.h
@ -44,15 +44,16 @@
 - (IBAction)doNextUnreadStory;
 - (IBAction)doPreviousStory;

+- (void)refreshComments;
 - (void)markedAsRead;
 - (void)setActiveStory;
 - (IBAction)toggleFontSize:(id)sender;
 - (void)setFontStyle:(NSString *)fontStyle;
 - (void)setFontSize:(float)fontSize;
 - (NSString *)getComments;
+- (NSString *)getComment:(NSDictionary *)commentDict;
 - (NSString *)getReplies:(NSArray *)replies;
 - (NSString *)getAvatars:(BOOL)areFriends;
 - (NSDictionary *)getUser:(int)user_id;
- (IBAction)doShareButton:(id)sender;

@end
--- a/media/iphone/Classes/StoryDetailViewController.m
+++ b/media/iphone/Classes/StoryDetailViewController.m
@ -166,7 +166,9 @@

 - (NSString *)getComments {
    NSString *comments = @"";
-    if ([appDelegate.activeStory objectForKey:@"share_count"] != [NSNull null]) {
+    NSLog(@"the comment string is %@", [appDelegate.activeStory objectForKey:@"share_count"]);
+    NSLog(@"appDelegate.activeStory is %@", appDelegate.activeStory);
+    if ([appDelegate.activeStory objectForKey:@"share_count"] != [NSNull null] && [[appDelegate.activeStory objectForKey:@"share_count"] intValue] > 0) {
        NSArray *comments_array = [appDelegate.activeStory objectForKey:@"comments"];            
        comments = [comments stringByAppendingString:[NSString stringWithFormat:@
                                                      "<div class=\"NB-feed-story-comments\">"
@ -190,32 +192,7 @@
                                                      ]];

        for (int i = 0; i < comments_array.count; i++) {
-            
-            NSDictionary *comment_dict = [comments_array objectAtIndex:i];
-            NSDictionary *user = [self getUser:[[comment_dict objectForKey:@"user_id"] intValue]];
-            NSString *comment = [NSString stringWithFormat:@
-                                 "<div class=\"NB-story-comment\"><div>"
-        
-                                 "<div class=\"NB-user-avatar\"><img src=\"%@\" /></div>"
-                                 
-                                 "<div class=\"NB-story-comment-author-container\">"
-                                 "<div class=\"NB-story-comment-username\">%@</div>"
-                                 "<div class=\"NB-story-comment-date\">%@</div>"
-                                 "<div class=\"NB-story-comment-reply-button\"><div class=\"NB-story-comment-reply-button-wrapper\">"
-                                 "<a href=\"http://ios.newsblur.com/reply/%@/%@\">reply</a>"
-                                 "</div></div>"
-                                 "</div>"
-
-                                 "<div class=\"NB-story-comment-content\">%@</div>"
-                                 "%@"
-                                 "</div></div>",
-                                 [user objectForKey:@"photo_url"],
-                                 [user objectForKey:@"username"],
-                                 [comment_dict objectForKey:@"shared_date"],
-                                 [comment_dict objectForKey:@"user_id"],
-                                 [user objectForKey:@"username"],
-                                 [comment_dict objectForKey:@"comments"],
-                                 [self getReplies:[comment_dict objectForKey:@"replies"]]];
+            NSString *comment = [self getComment:[comments_array objectAtIndex:i]];
            comments = [comments stringByAppendingString:comment];
        }
        comments = [comments stringByAppendingString:[NSString stringWithFormat:@"</div>"]];
@ -223,6 +200,32 @@
    return comments;
 }

+- (NSString *)getComment:(NSDictionary *)commentDict {
+    NSDictionary *user = [self getUser:[[commentDict objectForKey:@"user_id"] intValue]];
+    NSString *comment = [NSString stringWithFormat:@
+                         "<div class=\"NB-story-comment\" id=\"NB-user-comment-%@\"><div>"
+                         "<div class=\"NB-user-avatar\"><img src=\"%@\" /></div>"
+                         "<div class=\"NB-story-comment-author-container\">"
+                         "<div class=\"NB-story-comment-username\">%@</div>"
+                         "<div class=\"NB-story-comment-date\">%@</div>"
+                         "<div class=\"NB-story-comment-reply-button\"><div class=\"NB-story-comment-reply-button-wrapper\">"
+                         "<a href=\"http://ios.newsblur.com/reply/%@/%@\">reply</a>"
+                         "</div></div>"
+                         "</div>"
+                         "<div class=\"NB-story-comment-content\">%@</div>"
+                         "%@"
+                         "</div></div>",
+                         [commentDict objectForKey:@"user_id"],
+                         [user objectForKey:@"photo_url"],
+                         [user objectForKey:@"username"],
+                         [commentDict objectForKey:@"shared_date"],
+                         [commentDict objectForKey:@"user_id"],
+                         [user objectForKey:@"username"],
+                         [commentDict objectForKey:@"comments"],
+                         [self getReplies:[commentDict objectForKey:@"replies"]]];
+    return comment;
+}
+
 - (NSString *)getReplies:(NSArray *)replies {
    NSString *repliesString = @"";
    if (replies.count > 0) {
@ -259,7 +262,7 @@

 - (void)showStory {
    NSString *commentsString = [self getComments];    
-    NSString *customImgCssString, *universalImgCssString, *sharingHtmlString;
+    NSString *headerString, *sharingHtmlString;
    NSString *customBodyClass = @"";
    
    NSUserDefaults *userPreferences = [NSUserDefaults standardUserDefaults];    
@ -270,25 +273,13 @@
    }
    
    // set up layout values based on iPad/iPhone    
-    universalImgCssString = [NSString stringWithFormat:@
+    headerString = [NSString stringWithFormat:@
                             "<script src=\"zepto.js\"></script>"
                             "<script src=\"storyDetailView.js\"></script>"
                             "<link rel=\"stylesheet\" type=\"text/css\" href=\"reader.css\" >"
                             "<link rel=\"stylesheet\" type=\"text/css\" href=\"storyDetailView.css\" >"
                             "<meta name=\"viewport\" content=\"width=device-width\"/>"];
-    if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
-        customImgCssString = [NSString stringWithFormat:@"<style>"
-                              "h1, h2, h3, h4, h5, h6, div, table, span, pre, code, img {"
-                              "  max-width: 588px;"
-                              "}"
-                              "</style>"];
-    } else {
-        customImgCssString = [NSString stringWithFormat:@"<style>"
-                              "h1, h2, h3, h4, h5, h6, div, table, span, pre, code, img {"
-                              "  max-width: 296px;"
-                              "}"
-                              "</style>"];
-    }
+
    
   sharingHtmlString      = [NSString stringWithFormat:@
    "<div class='NB-share-header'></div>"
@ -330,14 +321,13 @@
                             story_author,
                             story_tags];
    NSString *htmlString = [NSString stringWithFormat:@
-                            "<html><head>%@ %@</head>"
+                            "<html><head>%@</head>"
                            "<body id=\"story_pane\" class=\"%@\">%@"
                            "<div class=\"NB-story\">%@ </div>"
-                            "%@" // comments
+                            "<div id=\"NB-comments-wrapper\">%@</div>" // comments
                            "%@" // share
                            "</body></html>",
-                            universalImgCssString, 
-                            customImgCssString,
+                            headerString, 
                            customBodyClass,
                            storyHeader, 
                            [appDelegate.activeStory objectForKey:@"story_content"],
@ -345,7 +335,7 @@
                            sharingHtmlString
                            ];

-    NSLog(@"\n\n\n\nhtmlString:\n\n\n%@\n\n\n", htmlString);
+    //NSLog(@"\n\n\n\nhtmlString:\n\n\n%@\n\n\n", htmlString);
    NSString *path = [[NSBundle mainBundle] bundlePath];
    NSURL *baseURL = [NSURL fileURLWithPath:path];
    
@ -500,6 +490,16 @@ shouldStartLoadWithRequest:(NSURLRequest *)request
    }
 }

+- (void)refreshComments {
+    NSString *commentsString = [self getComments];    
+    NSString *jsString = [[NSString alloc] initWithFormat:@
+                          "document.getElementById('NB-comments-wrapper').innerHTML = '%@';",
+                          commentsString];
+    [self.webView stringByEvaluatingJavaScriptFromString:jsString];
+    [jsString release];
+    
+}
+
 - (void)markedAsRead {
    
 }
--- a/media/iphone/NewsBlur.xcodeproj/project.pbxproj
+++ b/media/iphone/NewsBlur.xcodeproj/project.pbxproj
@ -88,8 +88,6 @@
 		43763AD2158F90B100B3DBE2 /* FontSettingsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43763AD0158F90B100B3DBE2 /* FontSettingsViewController.xib */; };
 		437AA8AD15922D13005463F5 /* FeedDashboardViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 437AA8AB15922D13005463F5 /* FeedDashboardViewController.m */; };
 		437AA8AE15922D13005463F5 /* FeedDashboardViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 437AA8AC15922D13005463F5 /* FeedDashboardViewController.xib */; };
-		437AA8B915929D51005463F5 /* zepto.js in Sources */ = {isa = PBXBuildFile; fileRef = 437AA8B815929D51005463F5 /* zepto.js */; };
-		437AA8BE15929DA7005463F5 /* storyDetailView.js in Sources */ = {isa = PBXBuildFile; fileRef = 437AA8BD15929DA7005463F5 /* storyDetailView.js */; };
 		437AA8C015929DFA005463F5 /* storyDetailView.css in Resources */ = {isa = PBXBuildFile; fileRef = 437AA8BF15929DFA005463F5 /* storyDetailView.css */; };
 		437AA8C115929FFF005463F5 /* zepto.js in Resources */ = {isa = PBXBuildFile; fileRef = 437AA8B815929D51005463F5 /* zepto.js */; };
 		437AA8C215929FFF005463F5 /* storyDetailView.js in Resources */ = {isa = PBXBuildFile; fileRef = 437AA8BD15929DA7005463F5 /* storyDetailView.js */; };
@ -381,7 +379,7 @@
 		78095EC6128F30B500230C8E /* OriginalStoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OriginalStoryViewController.h; sourceTree = "<group>"; };
 		78095EC7128F30B500230C8E /* OriginalStoryViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = OriginalStoryViewController.m; sourceTree = "<group>"; };
 		7842ECF511D44A530066CF9D /* StoryDetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StoryDetailViewController.h; sourceTree = "<group>"; };
-		7842ECF611D44A530066CF9D /* StoryDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = StoryDetailViewController.m; sourceTree = "<group>"; };
+		7842ECF611D44A530066CF9D /* StoryDetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = StoryDetailViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
 		7843F50311EEB1A000675F64 /* FeedDetailTableCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FeedDetailTableCell.h; sourceTree = "<group>"; };
 		7843F50411EEB1A000675F64 /* FeedDetailTableCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FeedDetailTableCell.m; sourceTree = "<group>"; };
 		784B50EA127E3F68008F90EA /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
@ -1518,8 +1516,6 @@
 				43763AD1158F90B100B3DBE2 /* FontSettingsViewController.m in Sources */,
 				439DAB201590DA350019B0EB /* FeedsMenuViewController.m in Sources */,
 				437AA8AD15922D13005463F5 /* FeedDashboardViewController.m in Sources */,
-				437AA8B915929D51005463F5 /* zepto.js in Sources */,
-				437AA8BE15929DA7005463F5 /* storyDetailView.js in Sources */,
 				437AA8CA159394E2005463F5 /* ShareViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
--- a/media/iphone/NewsBlur_Prefix.pch
+++ b/media/iphone/NewsBlur_Prefix.pch
@ -16,6 +16,6 @@
    #define BACKGROUND_REFRESH_SECONDS -10*60

 //    #define NEWSBLUR_URL [NSString stringWithFormat:@"nb.local.host:8000"]
-    #define NEWSBLUR_URL [NSString stringWithFormat:@"app02.newsblur.com"]
+    #define NEWSBLUR_URL [NSString stringWithFormat:@"dev.newsblur.com"]

 #endif
--- a/media/iphone/Resources-iPad/Classes/LoginViewController~ipad.xib
+++ b/media/iphone/Resources-iPad/Classes/LoginViewController~ipad.xib
@ -594,10 +594,6 @@
 						<double key="IBUITitleEdgeInsets.bottom">0.0</double>
 						<double key="IBUITitleEdgeInsets.left">16</double>
 						<double key="IBUITitleEdgeInsets.right">0.0</double>
-						<object class="NSColor" key="IBUITintColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC42IDAuNiAwLjYAA</bytes>
-						</object>
 						<string key="IBUINormalTitle">SIGN UP</string>
 						<object class="NSColor" key="IBUIHighlightedTitleColor" id="411844334">
 							<int key="NSColorSpace">3</int>
@ -636,10 +632,6 @@
 						<double key="IBUITitleEdgeInsets.bottom">0.0</double>
 						<double key="IBUITitleEdgeInsets.left">16</double>
 						<double key="IBUITitleEdgeInsets.right">0.0</double>
-						<object class="NSColor" key="IBUITintColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC42IDAuNiAwLjYAA</bytes>
-						</object>
 						<string key="IBUINormalTitle">LOGIN</string>
 						<reference key="IBUIHighlightedTitleColor" ref="411844334"/>
 						<reference key="IBUISelectedTitleColor" ref="872946822"/>
@ -1465,6 +1457,46 @@
 						<string key="minorKey">./Classes/BaseViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">FeedDashboardViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>toolbar</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NewsBlurAppDelegate</string>
+							<string>UIToolbar</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>toolbar</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">appDelegate</string>
+								<string key="candidateClassName">NewsBlurAppDelegate</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">toolbar</string>
+								<string key="candidateClassName">UIToolbar</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/FeedDashboardViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FeedDetailViewController</string>
 					<string key="superclassName">BaseViewController</string>
@ -1580,145 +1612,61 @@
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">FeedsViewController</string>
-					<string key="superclassName">BaseViewController</string>
+					<string key="className">FeedsMenuViewController</string>
+					<string key="superclassName">UIViewController</string>
 					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>doAddButton</string>
-							<string>doLogoutButton</string>
-							<string>doSwitchSitesUnread</string>
-							<string>sectionTapped:</string>
-							<string>sectionUntapped:</string>
-							<string>selectIntelligence</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>UIButton</string>
-							<string>UIButton</string>
-							<string>id</string>
-						</object>
+						<string key="NS.key.0">tapCancelButton:</string>
+						<string key="NS.object.0">UIBarButtonItem</string>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>doAddButton</string>
-							<string>doLogoutButton</string>
-							<string>doSwitchSitesUnread</string>
-							<string>sectionTapped:</string>
-							<string>sectionUntapped:</string>
-							<string>selectIntelligence</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">doAddButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">doLogoutButton</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">doSwitchSitesUnread</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">sectionTapped:</string>
-								<string key="candidateClassName">UIButton</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">sectionUntapped:</string>
-								<string key="candidateClassName">UIButton</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">selectIntelligence</string>
-								<string key="candidateClassName">id</string>
-							</object>
+						<string key="NS.key.0">tapCancelButton:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">tapCancelButton:</string>
+							<string key="candidateClassName">UIBarButtonItem</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addButton</string>
 							<string>appDelegate</string>
-							<string>feedScoreSlider</string>
-							<string>feedTitlesTable</string>
-							<string>feedViewToolbar</string>
-							<string>intelligenceControl</string>
-							<string>logoutButton</string>
-							<string>sitesButton</string>
+							<string>menuTableView</string>
+							<string>toolbar</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UIBarButtonItem</string>
 							<string>NewsBlurAppDelegate</string>
-							<string>UISlider</string>
 							<string>UITableView</string>
 							<string>UIToolbar</string>
-							<string>UISegmentedControl</string>
-							<string>UIBarButtonItem</string>
-							<string>UIBarButtonItem</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>addButton</string>
 							<string>appDelegate</string>
-							<string>feedScoreSlider</string>
-							<string>feedTitlesTable</string>
-							<string>feedViewToolbar</string>
-							<string>intelligenceControl</string>
-							<string>logoutButton</string>
-							<string>sitesButton</string>
+							<string>menuTableView</string>
+							<string>toolbar</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">addButton</string>
-								<string key="candidateClassName">UIBarButtonItem</string>
-							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">appDelegate</string>
 								<string key="candidateClassName">NewsBlurAppDelegate</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">feedScoreSlider</string>
-								<string key="candidateClassName">UISlider</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">feedTitlesTable</string>
+								<string key="name">menuTableView</string>
 								<string key="candidateClassName">UITableView</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">feedViewToolbar</string>
+								<string key="name">toolbar</string>
 								<string key="candidateClassName">UIToolbar</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">intelligenceControl</string>
-								<string key="candidateClassName">UISegmentedControl</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">logoutButton</string>
-								<string key="candidateClassName">UIBarButtonItem</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">sitesButton</string>
-								<string key="candidateClassName">UIBarButtonItem</string>
-							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/FeedsViewController.h</string>
+						<string key="minorKey">./Classes/FeedsMenuViewController.h</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
@ -1779,6 +1727,7 @@
 							<string>addSitesView</string>
 							<string>appDelegate</string>
 							<string>googleReaderButton</string>
+							<string>logo</string>
 							<string>nextButton</string>
 							<string>toolbar</string>
 							<string>toolbarTitle</string>
@ -1791,6 +1740,7 @@
 							<string>UIView</string>
 							<string>NewsBlurAppDelegate</string>
 							<string>UIButton</string>
+							<string>UIImageView</string>
 							<string>UIBarButtonItem</string>
 							<string>UIToolbar</string>
 							<string>UIButton</string>
@ -1806,6 +1756,7 @@
 							<string>addSitesView</string>
 							<string>appDelegate</string>
 							<string>googleReaderButton</string>
+							<string>logo</string>
 							<string>nextButton</string>
 							<string>toolbar</string>
 							<string>toolbarTitle</string>
@ -1833,6 +1784,10 @@
 								<string key="name">googleReaderButton</string>
 								<string key="candidateClassName">UIButton</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">logo</string>
+								<string key="candidateClassName">UIImageView</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">nextButton</string>
 								<string key="candidateClassName">UIBarButtonItem</string>
@ -1896,12 +1851,16 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
+							<string>fontSizeSgement</string>
+							<string>fontStyleSegment</string>
 							<string>largeFontSizeLabel</string>
 							<string>smallFontSizeLabel</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NewsBlurAppDelegate</string>
+							<string>UISegmentedControl</string>
+							<string>UISegmentedControl</string>
 							<string>UILabel</string>
 							<string>UILabel</string>
 						</object>
@ -1911,6 +1870,8 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
+							<string>fontSizeSgement</string>
+							<string>fontStyleSegment</string>
 							<string>largeFontSizeLabel</string>
 							<string>smallFontSizeLabel</string>
 						</object>
@ -1920,6 +1881,14 @@
 								<string key="name">appDelegate</string>
 								<string key="candidateClassName">NewsBlurAppDelegate</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fontSizeSgement</string>
+								<string key="candidateClassName">UISegmentedControl</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">fontStyleSegment</string>
+								<string key="candidateClassName">UISegmentedControl</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">largeFontSizeLabel</string>
 								<string key="candidateClassName">UILabel</string>
@ -2341,7 +2310,9 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addSiteViewController</string>
+							<string>feedDashboardViewController</string>
 							<string>feedDetailViewController</string>
+							<string>feedsMenuViewController</string>
 							<string>feedsViewController</string>
 							<string>firstTimeUserViewController</string>
 							<string>fontSettingsViewController</string>
@ -2350,6 +2321,7 @@
 							<string>moveSiteViewController</string>
 							<string>navigationController</string>
 							<string>originalStoryViewController</string>
+							<string>shareViewController</string>
 							<string>splitStoryController</string>
 							<string>splitStoryDetailNavigationController</string>
 							<string>splitStoryDetailViewController</string>
@ -2359,8 +2331,10 @@
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>AddSiteViewController</string>
+							<string>FeedDashboardViewController</string>
 							<string>FeedDetailViewController</string>
-							<string>FeedsViewController</string>
+							<string>FeedsMenuViewController</string>
+							<string>NewsBlurViewController</string>
 							<string>FirstTimeUserViewController</string>
 							<string>FontSettingsViewController</string>
 							<string>GoogleReaderViewController</string>
@ -2368,6 +2342,7 @@
 							<string>MoveSiteViewController</string>
 							<string>UINavigationController</string>
 							<string>OriginalStoryViewController</string>
+							<string>ShareViewController</string>
 							<string>UISplitViewController</string>
 							<string>UINavigationController</string>
 							<string>SplitStoryDetailViewController</string>
@ -2380,7 +2355,9 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>addSiteViewController</string>
+							<string>feedDashboardViewController</string>
 							<string>feedDetailViewController</string>
+							<string>feedsMenuViewController</string>
 							<string>feedsViewController</string>
 							<string>firstTimeUserViewController</string>
 							<string>fontSettingsViewController</string>
@ -2389,6 +2366,7 @@
 							<string>moveSiteViewController</string>
 							<string>navigationController</string>
 							<string>originalStoryViewController</string>
+							<string>shareViewController</string>
 							<string>splitStoryController</string>
 							<string>splitStoryDetailNavigationController</string>
 							<string>splitStoryDetailViewController</string>
@ -2401,13 +2379,21 @@
 								<string key="name">addSiteViewController</string>
 								<string key="candidateClassName">AddSiteViewController</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">feedDashboardViewController</string>
+								<string key="candidateClassName">FeedDashboardViewController</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">feedDetailViewController</string>
 								<string key="candidateClassName">FeedDetailViewController</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">feedsMenuViewController</string>
+								<string key="candidateClassName">FeedsMenuViewController</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">feedsViewController</string>
-								<string key="candidateClassName">FeedsViewController</string>
+								<string key="candidateClassName">NewsBlurViewController</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">firstTimeUserViewController</string>
@ -2437,6 +2423,10 @@
 								<string key="name">originalStoryViewController</string>
 								<string key="candidateClassName">OriginalStoryViewController</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">shareViewController</string>
+								<string key="candidateClassName">ShareViewController</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">splitStoryController</string>
 								<string key="candidateClassName">UISplitViewController</string>
@ -2464,6 +2454,141 @@
 						<string key="minorKey">./Classes/NewsBlurAppDelegate.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NewsBlurViewController</string>
+					<string key="superclassName">BaseViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>doSwitchSitesUnread</string>
+							<string>sectionTapped:</string>
+							<string>sectionUntapped:</string>
+							<string>selectIntelligence</string>
+							<string>showMenuButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>UIButton</string>
+							<string>UIButton</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>doSwitchSitesUnread</string>
+							<string>sectionTapped:</string>
+							<string>sectionUntapped:</string>
+							<string>selectIntelligence</string>
+							<string>showMenuButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">doSwitchSitesUnread</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">sectionTapped:</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">sectionUntapped:</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">selectIntelligence</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">showMenuButton</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>feedScoreSlider</string>
+							<string>feedTitlesTable</string>
+							<string>feedViewToolbar</string>
+							<string>homeButton</string>
+							<string>intelligenceControl</string>
+							<string>popoverController</string>
+							<string>sitesButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NewsBlurAppDelegate</string>
+							<string>UISlider</string>
+							<string>UITableView</string>
+							<string>UIToolbar</string>
+							<string>UIBarButtonItem</string>
+							<string>UISegmentedControl</string>
+							<string>UIPopoverController</string>
+							<string>UIBarButtonItem</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>feedScoreSlider</string>
+							<string>feedTitlesTable</string>
+							<string>feedViewToolbar</string>
+							<string>homeButton</string>
+							<string>intelligenceControl</string>
+							<string>popoverController</string>
+							<string>sitesButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">appDelegate</string>
+								<string key="candidateClassName">NewsBlurAppDelegate</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">feedScoreSlider</string>
+								<string key="candidateClassName">UISlider</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">feedTitlesTable</string>
+								<string key="candidateClassName">UITableView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">feedViewToolbar</string>
+								<string key="candidateClassName">UIToolbar</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">homeButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">intelligenceControl</string>
+								<string key="candidateClassName">UISegmentedControl</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">popoverController</string>
+								<string key="candidateClassName">UIPopoverController</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sitesButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NewsBlurViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">OriginalStoryViewController</string>
 					<string key="superclassName">BaseViewController</string>
@ -2599,6 +2724,134 @@
 						<string key="minorKey">./Classes/OriginalStoryViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">ShareViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>doCancelButton:</string>
+							<string>doReplyToComment:</string>
+							<string>doShareThisStory:</string>
+							<string>doToggleButton:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>doCancelButton:</string>
+							<string>doReplyToComment:</string>
+							<string>doShareThisStory:</string>
+							<string>doToggleButton:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">doCancelButton:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doReplyToComment:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doShareThisStory:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">doToggleButton:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>commentField</string>
+							<string>facebookButton</string>
+							<string>siteFavicon</string>
+							<string>siteInformation</string>
+							<string>submitButton</string>
+							<string>toolbarTitle</string>
+							<string>twitterButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NewsBlurAppDelegate</string>
+							<string>UITextView</string>
+							<string>UIButton</string>
+							<string>UIImageView</string>
+							<string>UILabel</string>
+							<string>UIBarButtonItem</string>
+							<string>UIBarButtonItem</string>
+							<string>UIButton</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>appDelegate</string>
+							<string>commentField</string>
+							<string>facebookButton</string>
+							<string>siteFavicon</string>
+							<string>siteInformation</string>
+							<string>submitButton</string>
+							<string>toolbarTitle</string>
+							<string>twitterButton</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">appDelegate</string>
+								<string key="candidateClassName">NewsBlurAppDelegate</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">commentField</string>
+								<string key="candidateClassName">UITextView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">facebookButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">siteFavicon</string>
+								<string key="candidateClassName">UIImageView</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">siteInformation</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">submitButton</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">toolbarTitle</string>
+								<string key="candidateClassName">UIBarButtonItem</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">twitterButton</string>
+								<string key="candidateClassName">UIButton</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/ShareViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">SplitStoryDetailViewController</string>
 					<string key="superclassName">UIViewController</string>
--- a/media/iphone/sample_text.html
+++ b/media/iphone/sample_text.html
--- a/media/iphone/storyDetailView.css
+++ b/media/iphone/storyDetailView.css
@ -85,7 +85,7 @@ blockquote {
    margin: 0 0 20px 20px;
 }

-h1, h2, h3, h4, h5, h6, div, table, span, pre, code, img {  
+h1, h2, h3, h4, h5, h6, table, span, pre, code, img {  
    max-width: 588px;
 }