adding in new FIND SITES flow

media/ios/Classes/FindSitesViewController.h

@@ -0,0 +1,34 @@
+//
+//  findSitesViewController.h
+//  NewsBlur
+//
+//  Created by Roy Yang on 7/31/12.
+//  Copyright (c) 2012 NewsBlur. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class NewsBlurAppDelegate;
+@class ASIHTTPRequest;
+
+@interface FindSitesViewController : UIViewController 
+<UITableViewDataSource, UITableViewDataSource, UISearchBarDelegate> {
+    NewsBlurAppDelegate *appDelegate;
+    UISearchBar *sitesSearchBar;
+    UITableView *sitesTable;
+    
+    NSArray *sites;
+}
+
+@property (nonatomic) IBOutlet NewsBlurAppDelegate *appDelegate;
+@property (nonatomic) IBOutlet UISearchBar *sitesSearchBar;
+@property (nonatomic) IBOutlet UITableView *sitesTable;
+@property (nonatomic) NSArray *sites;
+
+
+- (void)doCancelButton;
+- (void)loadSitesList:(NSString *)query;
+- (void)requestFinished:(ASIHTTPRequest *)request;
+- (void)requestFailed:(ASIHTTPRequest *)request;
+
+@end

media/ios/Classes/FindSitesViewController.m

@@ -0,0 +1,263 @@
+//
+//  FriendsListViewController.m
+//  NewsBlur
+//
+//  Created by Roy Yang on 7/1/12.
+//  Copyright (c) 2012 NewsBlur. All rights reserved.
+//
+
+#import "NewsBlurAppDelegate.h"
+#import "ASIHTTPRequest.h"
+#import "FindSitesViewController.h"
+#import "MBProgressHUD.h"
+
+#define FIND_SITES_ROW_HEIGHT 80;
+
+@implementation UINavigationController (DelegateAutomaticDismissKeyboard)
+- (BOOL)disablesAutomaticKeyboardDismissal {
+    return [self.topViewController disablesAutomaticKeyboardDismissal];
+}
+@end
+
+@interface FindSitesViewController()
+
+@property (readwrite) BOOL inSearch_;
+
+@end
+
+@implementation FindSitesViewController
+
+@synthesize appDelegate;
+@synthesize sitesSearchBar;
+@synthesize sitesTable;
+@synthesize sites;
+@synthesize inSearch_;
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+	
+    if ((self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil])) {
+    }
+    return self;
+}
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    self.appDelegate = (NewsBlurAppDelegate *)[[UIApplication sharedApplication] delegate];
+    
+    self.navigationItem.title = @"Find Sites";
+    UIBarButtonItem *cancelButton = [[UIBarButtonItem alloc] initWithTitle: @"Done" 
+                                                                     style: UIBarButtonSystemItemCancel 
+                                                                    target: self 
+                                                                    action: @selector(doCancelButton)];
+    [self.navigationItem setRightBarButtonItem:cancelButton];
+        
+    self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
+    
+    self.sitesTable.rowHeight = FIND_SITES_ROW_HEIGHT;
+    
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+    
+    self.appDelegate = nil;
+    self.sitesSearchBar = nil;
+    self.sitesTable = nil;
+    self.sites = nil;
+
+}
+
+- (void)viewWillAppear:(BOOL)animated {
+    [self.sitesSearchBar becomeFirstResponder];
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
+	return YES;
+}
+
+- (void)doCancelButton {
+    [appDelegate.modalNavigationController dismissModalViewControllerAnimated:YES];
+}
+
+#pragma mark - UISearchBar delegate methods
+
+- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText {
+
+}
+
+- (void)searchBarTextDidEndEditing:(UISearchBar *)theSearchBar {
+    [theSearchBar resignFirstResponder];
+}
+
+- (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
+    [searchBar resignFirstResponder];
+    if (searchBar.text.length == 0) {
+        self.sites = nil; 
+        self.inSearch_ = NO;
+        [self.sitesTable reloadData];
+    } else {
+        self.inSearch_ = YES;
+        [self loadSitesList:searchBar.text];
+    }
+}
+
+- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {
+    searchBar.text = nil;
+}
+
+- (void)loadSitesList:(NSString *)query {
+    [MBProgressHUD hideHUDForView:self.view animated:YES];
+    MBProgressHUD *HUD = [MBProgressHUD showHUDAddedTo:self.view animated:YES];
+    HUD.labelText = @"Searching...";
+    
+    NSString *urlString = [NSString stringWithFormat:@"http://%@/rss_feeds/feed_autocomplete?term=%@&limit=10",
+                           NEWSBLUR_URL, [query stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]];
+    
+    NSURL *url = [NSURL URLWithString:urlString];
+    
+    ASIHTTPRequest *request = [ASIHTTPRequest requestWithURL:url];
+    [request setDelegate:self];
+    [request setDidFinishSelector:@selector(requestFinished:)];
+    [request setDidFailSelector:@selector(requestFailed:)];
+    [request startAsynchronous];
+}
+
+- (void)requestFinished:(ASIHTTPRequest *)request {
+    [MBProgressHUD hideHUDForView:self.view animated:YES];
+    if (self.inSearch_) {
+        NSString *responseString = [request responseString];
+        NSData *responseData= [responseString dataUsingEncoding:NSUTF8StringEncoding];    
+        NSError *error;
+        NSArray *results = [NSJSONSerialization 
+                                 JSONObjectWithData:responseData
+                                 options:kNilOptions 
+                                 error:&error];
+        // int statusCode = [request responseStatusCode];
+        
+        self.sites = results;
+
+        [self.sitesTable reloadData];
+    }
+    
+}
+
+- (void)requestFailed:(ASIHTTPRequest *)request {
+    [MBProgressHUD hideHUDForView:self.view animated:YES];
+    NSError *error = [request error];
+    NSLog(@"Error: %@", error);
+}
+
+- (BOOL)disablesAutomaticKeyboardDismissal {
+    return NO;
+}
+
+#pragma mark - Table view data source
+
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
+    return 1;
+}
+
+- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return FIND_SITES_ROW_HEIGHT;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {    
+    if (self.inSearch_){
+        int siteCount = [self.sites count];
+        return siteCount;
+    } else {
+        return 0;
+    }
+}
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
+    CGRect vb = self.view.bounds;
+    
+    static NSString *CellIdentifier = @"ProfileBadgeCellIdentifier";
+    UITableViewCell *cell = [tableView 
+                             dequeueReusableCellWithIdentifier:CellIdentifier];
+    
+    if (cell == nil) {
+        cell = [[UITableViewCell alloc] 
+                initWithStyle:UITableViewCellStyleSubtitle 
+                reuseIdentifier:nil];
+    } else {
+        [[[cell contentView] subviews] makeObjectsPerformSelector: @selector(removeFromSuperview)];
+    }
+    
+
+    if (self.inSearch_){
+        int sitesCount = [self.sites count];
+        
+        if (sitesCount) {
+            if (sitesCount > indexPath.row) {
+                cell.detailTextLabel.text = [NSString stringWithFormat:@"%@", [[self.sites objectAtIndex:indexPath.row] objectForKey:@"value"]];
+                cell.textLabel.text = [NSString stringWithFormat:@"%@", [[self.sites objectAtIndex:indexPath.row] objectForKey:@"label"]];
+                cell.accessoryType = UITableViewCellAccessoryDetailDisclosureButton;
+            }
+        } else {
+            // add a NO FRIENDS TO SUGGEST message on either the first or second row depending on iphone/ipad
+            int row = 0;
+            if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+                row = 1;
+            }
+            
+            if (indexPath.row == row) {
+                UILabel *msg = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, vb.size.width, 140)];
+                [cell.contentView addSubview:msg];
+                msg.text = @"No results.";
+                msg.textColor = UIColorFromRGB(0x7a7a7a);
+                if (vb.size.width > 320) {
+                    msg.font = [UIFont fontWithName:@"Helvetica-Bold" size: 20.0];
+                } else {
+                    msg.font = [UIFont fontWithName:@"Helvetica-Bold" size: 14.0];
+                }
+                msg.textAlignment = UITextAlignmentCenter;
+            }
+            
+        }
+        
+    } else {
+        
+        int row = 0;
+        if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
+            row = 1;
+        }
+        
+        if (indexPath.row == row) {
+            UILabel *msg = [[UILabel alloc] initWithFrame:CGRectMake(0, 0, vb.size.width, 140)];
+            [cell.contentView addSubview:msg];
+            msg.text = @"Search for sites above";
+            msg.textColor = UIColorFromRGB(0x7a7a7a);
+            if (vb.size.width > 320) {
+                msg.font = [UIFont fontWithName:@"Helvetica-Bold" size: 20.0];
+            } else {
+                msg.font = [UIFont fontWithName:@"Helvetica-Bold" size: 14.0];
+            }
+            msg.textAlignment = UITextAlignmentCenter;
+        }
+    }
+    
+    cell.selectionStyle = UITableViewCellSelectionStyleNone;
+    return cell;
+}
+
+- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView {
+    [self.sitesSearchBar resignFirstResponder];
+}
+
+- (void)tableView:(UITableView *)tableView accessoryButtonTappedForRowWithIndexPath:(NSIndexPath *)indexPath {
+    NSInteger currentRow = indexPath.row;
+    int row = currentRow;
+    [self.sitesSearchBar resignFirstResponder];
+
+//    [appDelegate.modalNavigationController pushViewController:appDelegate.userProfileViewController animated:YES];
+//    [appDelegate.userProfileViewController getUserProfile];
+}
+
+@end

media/ios/Classes/FriendsListViewController.m

@@ -11,6 +11,7 @@
 #import "UserProfileViewController.h"
 #import "ASIHTTPRequest.h"
 #import "ProfileBadge.h"
+#import "MBProgressHUD.h"
 
 @implementation UINavigationController (DelegateAutomaticDismissKeyboard)
 - (BOOL)disablesAutomaticKeyboardDismissal {
@@ -87,7 +88,7 @@
 }
 
 - (void)doCancelButton {
-    [appDelegate.findFriendsNavigationController dismissModalViewControllerAnimated:YES];
+    [appDelegate.modalNavigationController dismissModalViewControllerAnimated:YES];
 }
 
 #pragma mark - UISearchBar delegate methods
@@ -115,7 +116,7 @@
     searchBar.text = nil;
 }
 
-- (void)loadFriendsList:(NSString *)query {
+- (void)loadFriendsList:(NSString *)query {    
     NSString *urlString = [NSString stringWithFormat:@"http://%@/social/find_friends?query=%@&limit=10",
                            NEWSBLUR_URL,
                            query];
@@ -382,8 +383,8 @@ viewForHeaderInSection:(NSInteger)section {
     int row = currentRow;
     appDelegate.activeUserProfileId = [[self.userProfiles objectAtIndex:row] objectForKey:@"user_id"];
     [self.friendSearchBar resignFirstResponder];
-    NSLog(@"appDelegate.findFriendsNavigationController is %@", appDelegate.findFriendsNavigationController);
-    [appDelegate.findFriendsNavigationController pushViewController:appDelegate.userProfileViewController animated:YES];
+    NSLog(@"appDelegate.modalNavigationController is %@", appDelegate.modalNavigationController);
+    [appDelegate.modalNavigationController pushViewController:appDelegate.userProfileViewController animated:YES];
     [appDelegate.userProfileViewController getUserProfile];
 }
 

media/ios/Classes/NBContainerViewController.m

@@ -210,7 +210,7 @@
         [popoverController dismissPopoverAnimated:YES];
         popoverController = nil;
     }
-    [appDelegate.findFriendsNavigationController dismissModalViewControllerAnimated:YES];
+    [appDelegate.modalNavigationController dismissModalViewControllerAnimated:YES];
 }
 
 

media/ios/Classes/NewsBlurAppDelegate.h

@@ -37,13 +37,14 @@
 @class OriginalStoryViewController;
 @class UserProfileViewController;
 @class NBContainerViewController;
+@class FindSitesViewController;
 
 
 @interface NewsBlurAppDelegate : BaseViewController <UIApplicationDelegate, UIAlertViewDelegate>  {
     UIWindow *window;
     UINavigationController *ftuxNavigationController;
     UINavigationController *navigationController;
-    UINavigationController *findFriendsNavigationController;
+    UINavigationController *modalNavigationController;
     UINavigationController *userProfileNavigationController;
     NBContainerViewController *masterContainerViewController;
 
@@ -65,6 +66,7 @@
     ShareViewController *shareViewController;
     LoginViewController *loginViewController;
     AddSiteViewController *addSiteViewController;
+    FindSitesViewController *findSitesViewController;
     MoveSiteViewController *moveSiteViewController;
     OriginalStoryViewController *originalStoryViewController;
     UserProfileViewController *userProfileViewController;
@@ -112,7 +114,7 @@
 @property (nonatomic) IBOutlet UIWindow *window;
 @property (nonatomic) IBOutlet UINavigationController *ftuxNavigationController;
 @property (nonatomic) IBOutlet UINavigationController *navigationController;
-@property (nonatomic) UINavigationController *findFriendsNavigationController;
+@property (nonatomic) UINavigationController *modalNavigationController;
 @property (nonatomic) UINavigationController *userProfileNavigationController;
 @property (nonatomic) IBOutlet NBContainerViewController *masterContainerViewController;
 @property (nonatomic) IBOutlet DashboardViewController *dashboardViewController;
@@ -125,6 +127,7 @@
 @property (nonatomic) IBOutlet StoryDetailViewController *storyDetailViewController;
 @property (nonatomic) IBOutlet LoginViewController *loginViewController;
 @property (nonatomic) IBOutlet AddSiteViewController *addSiteViewController;
+@property (nonatomic) IBOutlet FindSitesViewController *findSitesViewController;
 @property (nonatomic) IBOutlet MoveSiteViewController *moveSiteViewController;
 @property (nonatomic) IBOutlet OriginalStoryViewController *originalStoryViewController;
 @property (nonatomic) IBOutlet ShareViewController *shareViewController;

media/ios/Classes/NewsBlurAppDelegate.m

@@ -18,12 +18,14 @@
 #import "GoogleReaderViewController.h"
 #import "LoginViewController.h"
 #import "AddSiteViewController.h"
+#import "FindSitesViewController.h"
 #import "MoveSiteViewController.h"
 #import "OriginalStoryViewController.h"
 #import "ShareViewController.h"
 #import "UserProfileViewController.h"
 #import "NBContainerViewController.h"
 #import "AFJSONRequestOperation.h"
+#import "findSitesViewController.h"
 
 #import "MBProgressHUD.h"
 #import "Utilities.h"
@@ -35,7 +37,7 @@
 
 @synthesize ftuxNavigationController;
 @synthesize navigationController;
-@synthesize findFriendsNavigationController;
+@synthesize modalNavigationController;
 @synthesize userProfileNavigationController;
 @synthesize masterContainerViewController;
 @synthesize googleReaderViewController;
@@ -50,6 +52,7 @@
 @synthesize shareViewController;
 @synthesize loginViewController;
 @synthesize addSiteViewController;
+@synthesize findSitesViewController;
 @synthesize moveSiteViewController;
 @synthesize originalStoryViewController;
 @synthesize userProfileViewController;
@@ -139,15 +142,19 @@
 #pragma mark FeedsView
 
 - (void)showAddSiteModal {
-    UINavigationController *navController = self.navigationController;
-    [navController dismissModalViewControllerAnimated:NO];
+    FindSitesViewController *sitesVC = [[FindSitesViewController alloc] init];    
+    self.findSitesViewController = sitesVC;
+    
+    UINavigationController *sitesNav = [[UINavigationController alloc] initWithRootViewController:sitesVC];
+    self.modalNavigationController = sitesNav;
+    self.modalNavigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
     
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-        addSiteViewController.modalPresentationStyle = UIModalPresentationFormSheet;
+        self.modalNavigationController.modalPresentationStyle = UIModalPresentationFormSheet;
+        [masterContainerViewController presentModalViewController:modalNavigationController animated:YES];
+    } else {
+        [navigationController presentModalViewController:modalNavigationController animated:YES];
     }
-    
-    [navController presentModalViewController:addSiteViewController animated:YES];
-    [addSiteViewController reload];
 }
 
 #pragma mark -
@@ -210,14 +217,14 @@
     UINavigationController *friendsNav = [[UINavigationController alloc] initWithRootViewController:friendsListViewController];
     
     self.friendsListViewController = friendsBVC;    
-    self.findFriendsNavigationController = friendsNav;
-    self.findFriendsNavigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
+    self.modalNavigationController = friendsNav;
+    self.modalNavigationController.navigationBar.tintColor = [UIColor colorWithRed:0.16f green:0.36f blue:0.46 alpha:0.9];
     
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-        self.findFriendsNavigationController.modalPresentationStyle = UIModalPresentationFormSheet;
-        [masterContainerViewController presentModalViewController:findFriendsNavigationController animated:YES];
+        self.modalNavigationController.modalPresentationStyle = UIModalPresentationFormSheet;
+        [masterContainerViewController presentModalViewController:modalNavigationController animated:YES];
     } else {
-        [navigationController presentModalViewController:findFriendsNavigationController animated:YES];
+        [navigationController presentModalViewController:modalNavigationController animated:YES];
     }
     [self.friendsListViewController loadSuggestedFriendsList];
 }

media/ios/Classes/UserProfileViewController.m

@@ -84,7 +84,7 @@
 }
 
 - (void)doCancelButton {
-    [appDelegate.findFriendsNavigationController dismissModalViewControllerAnimated:NO];
+    [appDelegate.modalNavigationController dismissModalViewControllerAnimated:NO];
 }
 
 - (void)getUserProfile {

media/ios/NewsBlur.xcodeproj/project.pbxproj

@@ -84,6 +84,8 @@
 		43A4BAE815C866FA00F3B8D4 /* popoverBg@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4BAD915C866FA00F3B8D4 /* popoverBg@2x.png */; };
 		43A4BAE915C866FA00F3B8D4 /* popoverBgSimple.png in Resources */ = {isa = PBXBuildFile; fileRef = 43A4BADA15C866FA00F3B8D4 /* popoverBgSimple.png */; };
 		43A4BAEB15C893E300F3B8D4 /* FriendsListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43A4BAEA15C893E300F3B8D4 /* FriendsListViewController.xib */; };
+		43A4BAF315C89BF600F3B8D4 /* FindSitesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 43A4BAF115C89BF600F3B8D4 /* FindSitesViewController.m */; };
+		43A4BAF415C89BF600F3B8D4 /* FindSitesViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 43A4BAF215C89BF600F3B8D4 /* FindSitesViewController.xib */; };
 		43A4C3D715B00966008787B5 /* ABTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 43A4C3BA15B00966008787B5 /* ABTableViewCell.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		43A4C3D815B00966008787B5 /* Base64.m in Sources */ = {isa = PBXBuildFile; fileRef = 43A4C3BC15B00966008787B5 /* Base64.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
 		43A4C3DA15B00966008787B5 /* GTMNString+HTML.m in Sources */ = {isa = PBXBuildFile; fileRef = 43A4C3C015B00966008787B5 /* GTMNString+HTML.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -426,6 +428,9 @@
 		43A4BAD915C866FA00F3B8D4 /* popoverBg@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "popoverBg@2x.png"; sourceTree = "<group>"; };
 		43A4BADA15C866FA00F3B8D4 /* popoverBgSimple.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = popoverBgSimple.png; sourceTree = "<group>"; };
 		43A4BAEA15C893E300F3B8D4 /* FriendsListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FriendsListViewController.xib; sourceTree = "<group>"; };
+		43A4BAF015C89BF600F3B8D4 /* FindSitesViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FindSitesViewController.h; sourceTree = "<group>"; };
+		43A4BAF115C89BF600F3B8D4 /* FindSitesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FindSitesViewController.m; sourceTree = "<group>"; };
+		43A4BAF215C89BF600F3B8D4 /* FindSitesViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FindSitesViewController.xib; sourceTree = "<group>"; };
 		43A4C3B915B00966008787B5 /* ABTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ABTableViewCell.h; path = "Other Sources/ABTableViewCell.h"; sourceTree = "<group>"; };
 		43A4C3BA15B00966008787B5 /* ABTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ABTableViewCell.m; path = "Other Sources/ABTableViewCell.m"; sourceTree = "<group>"; };
 		43A4C3BB15B00966008787B5 /* Base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Base64.h; path = "Other Sources/Base64.h"; sourceTree = "<group>"; };
@@ -953,6 +958,9 @@
 				43F6A79C15B0CDC60092EE91 /* ActivityCell.m */,
 				4383DCD415BB8B87007E6611 /* SmallActivityCell.h */,
 				4383DCD515BB8B88007E6611 /* SmallActivityCell.m */,
+				43A4BAF015C89BF600F3B8D4 /* FindSitesViewController.h */,
+				43A4BAF115C89BF600F3B8D4 /* FindSitesViewController.m */,
+				43A4BAF215C89BF600F3B8D4 /* FindSitesViewController.xib */,
 			);
 			name = Social;
 			sourceTree = "<group>";
@@ -1920,6 +1928,7 @@
 				43A4BAE815C866FA00F3B8D4 /* popoverBg@2x.png in Resources */,
 				43A4BAE915C866FA00F3B8D4 /* popoverBgSimple.png in Resources */,
 				43A4BAEB15C893E300F3B8D4 /* FriendsListViewController.xib in Resources */,
+				43A4BAF415C89BF600F3B8D4 /* FindSitesViewController.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2061,6 +2070,7 @@
 				43A4BAC915C8663600F3B8D4 /* WEPopoverContainerView.m in Sources */,
 				43A4BACA15C8663600F3B8D4 /* WEPopoverController.m in Sources */,
 				43A4BACB15C8663600F3B8D4 /* WETouchableView.m in Sources */,
+				43A4BAF315C89BF600F3B8D4 /* FindSitesViewController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

media/ios/Resources-iPad/MainWindow~ipad.xib

@@ -47,6 +47,7 @@
 				<string key="NSFrameSize">{768, 1024}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -268,8 +269,7 @@
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
 			</object>
-			<object class="IBUINavigationController" id="763276607">
-				<string key="IBUITitle">FindFriends</string>
+			<object class="IBUIViewController" id="231215530">
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics">
 					<int key="IBUIStatusBarStyle">2</int>
 				</object>
@@ -279,18 +279,6 @@
 				</object>
 				<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
-				<object class="IBUINavigationBar" key="IBUINavigationBar" id="176676855">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<string key="NSFrameSize">{0, 0}</string>
-					<string key="NSReuseIdentifierKey">_NS:15</string>
-					<bool key="IBUIClipsSubviews">YES</bool>
-					<bool key="IBUIMultipleTouchEnabled">YES</bool>
-					<string key="targetRuntimeIdentifier">IBIPadFramework</string>
-				</object>
-				<object class="NSMutableArray" key="IBUIViewControllers">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-				</object>
 			</object>
 			<object class="IBUINavigationController" id="396985587">
 				<string key="IBUITitle">Main</string>
@@ -458,14 +446,6 @@
 					</object>
 					<int key="connectionID">185</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">findFriendsNavigationController</string>
-						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="763276607"/>
-					</object>
-					<int key="connectionID">226</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">friendsListViewController</string>
@@ -522,6 +502,14 @@
 					</object>
 					<int key="connectionID">266</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">findSitesViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="231215530"/>
+					</object>
+					<int key="connectionID">270</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">appDelegate</string>
@@ -674,6 +662,14 @@
 					</object>
 					<int key="connectionID">267</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">appDelegate</string>
+						<reference key="source" ref="231215530"/>
+						<reference key="destination" ref="664661524"/>
+					</object>
+					<int key="connectionID">269</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -808,20 +804,6 @@
 						<reference key="object" ref="370996944"/>
 						<reference key="parent" ref="396985587"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">222</int>
-						<reference key="object" ref="763276607"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="176676855"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">223</int>
-						<reference key="object" ref="176676855"/>
-						<reference key="parent" ref="763276607"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">235</int>
 						<reference key="object" ref="556336188"/>
@@ -852,6 +834,11 @@
 						<reference key="object" ref="375827920"/>
 						<reference key="parent" ref="0"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">268</int>
+						<reference key="object" ref="231215530"/>
+						<reference key="parent" ref="0"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -897,8 +884,6 @@
 					<string>176.IBPluginDependency</string>
 					<string>201.CustomClassName</string>
 					<string>201.IBPluginDependency</string>
-					<string>222.IBPluginDependency</string>
-					<string>223.IBPluginDependency</string>
 					<string>235.CustomClassName</string>
 					<string>235.IBPluginDependency</string>
 					<string>238.CustomClassName</string>
@@ -911,6 +896,8 @@
 					<string>253.IBPluginDependency</string>
 					<string>264.CustomClassName</string>
 					<string>264.IBPluginDependency</string>
+					<string>268.CustomClassName</string>
+					<string>268.IBPluginDependency</string>
 					<string>3.CustomClassName</string>
 					<string>3.IBPluginDependency</string>
 					<string>51.CustomClassName</string>
@@ -982,8 +969,6 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>FriendsListViewController</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UserProfileViewController</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>DashboardViewController</string>
@@ -996,6 +981,8 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>NBContainerViewController</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>FindSitesViewController</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>NewsBlurAppDelegate</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>FeedDetailViewController</string>
@@ -1024,7 +1011,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">267</int>
+			<int key="maxID">270</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1460,30 +1447,17 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">FeedsMenuViewController</string>
 					<string key="superclassName">UIViewController</string>
-					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">tapCancelButton:</string>
-						<string key="NS.object.0">UIBarButtonItem</string>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<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>appDelegate</string>
 							<string>menuTableView</string>
-							<string>toolbar</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NewsBlurAppDelegate</string>
 							<string>UITableView</string>
-							<string>UIToolbar</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1492,7 +1466,6 @@
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
 							<string>menuTableView</string>
-							<string>toolbar</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1504,10 +1477,6 @@
 								<string key="name">menuTableView</string>
 								<string key="candidateClassName">UITableView</string>
 							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">toolbar</string>
-								<string key="candidateClassName">UIToolbar</string>
-							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1515,6 +1484,53 @@
 						<string key="minorKey">./Classes/FeedsMenuViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">FindSitesViewController</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>sitesSearchBar</string>
+							<string>sitesTable</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NewsBlurAppDelegate</string>
+							<string>UISearchBar</string>
+							<string>UITableView</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>sitesSearchBar</string>
+							<string>sitesTable</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">sitesSearchBar</string>
+								<string key="candidateClassName">UISearchBar</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sitesTable</string>
+								<string key="candidateClassName">UITableView</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/FindSitesViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstTimeUserAddFriendsViewController</string>
 					<string key="superclassName">UIViewController</string>
@@ -2115,20 +2131,20 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FriendsListViewController</string>
-					<string key="superclassName">UITableViewController</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>searchBar</string>
-							<string>searchDisplayController</string>
+							<string>friendSearchBar</string>
+							<string>friendsTable</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NewsBlurAppDelegate</string>
 							<string>UISearchBar</string>
-							<string>UISearchDisplayController</string>
+							<string>UITableView</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -2136,8 +2152,8 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
-							<string>searchBar</string>
-							<string>searchDisplayController</string>
+							<string>friendSearchBar</string>
+							<string>friendsTable</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2146,12 +2162,12 @@
 								<string key="candidateClassName">NewsBlurAppDelegate</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">searchBar</string>
+								<string key="name">friendSearchBar</string>
 								<string key="candidateClassName">UISearchBar</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">searchDisplayController</string>
-								<string key="candidateClassName">UISearchDisplayController</string>
+								<string key="name">friendsTable</string>
+								<string key="candidateClassName">UITableView</string>
 							</object>
 						</object>
 					</object>
@@ -2598,6 +2614,7 @@
 							<string>feedDetailViewController</string>
 							<string>feedsMenuViewController</string>
 							<string>feedsViewController</string>
+							<string>findSitesViewController</string>
 							<string>firstTimeUserAddFriendsViewController</string>
 							<string>firstTimeUserAddNewsBlurViewController</string>
 							<string>firstTimeUserAddSitesViewController</string>
@@ -2624,6 +2641,7 @@
 							<string>FeedDetailViewController</string>
 							<string>FeedsMenuViewController</string>
 							<string>NewsBlurViewController</string>
+							<string>FindSitesViewController</string>
 							<string>FirstTimeUserAddFriendsViewController</string>
 							<string>FirstTimeUserAddNewsBlurViewController</string>
 							<string>FirstTimeUserAddSitesViewController</string>
@@ -2653,6 +2671,7 @@
 							<string>feedDetailViewController</string>
 							<string>feedsMenuViewController</string>
 							<string>feedsViewController</string>
+							<string>findSitesViewController</string>
 							<string>firstTimeUserAddFriendsViewController</string>
 							<string>firstTimeUserAddNewsBlurViewController</string>
 							<string>firstTimeUserAddSitesViewController</string>
@@ -2697,6 +2716,10 @@
 								<string key="name">feedsViewController</string>
 								<string key="candidateClassName">NewsBlurViewController</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">findSitesViewController</string>
+								<string key="candidateClassName">FindSitesViewController</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">firstTimeUserAddFriendsViewController</string>
 								<string key="candidateClassName">FirstTimeUserAddFriendsViewController</string>
@@ -2783,7 +2806,7 @@
 							<string>sectionUntapped:</string>
 							<string>sectionUntappedOutside:</string>
 							<string>selectIntelligence</string>
-							<string>showMenuButton:</string>
+							<string>tapAddSite:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2802,7 +2825,7 @@
 							<string>sectionUntapped:</string>
 							<string>sectionUntappedOutside:</string>
 							<string>selectIntelligence</string>
-							<string>showMenuButton:</string>
+							<string>tapAddSite:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2823,7 +2846,7 @@
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">showMenuButton:</string>
+								<string key="name">tapAddSite:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 						</object>

media/ios/Resources-iPhone/MainWindow.xib

@@ -135,7 +135,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
 			</object>
-			<object class="IBUIViewController" id="824014421">
+			<object class="IBUIViewController" id="666299817">
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 					<int key="IBUIInterfaceOrientation">1</int>
@@ -144,7 +144,16 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
 			</object>
-			<object class="IBUIViewController" id="181086508">
+			<object class="IBUIViewController" id="925352312">
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+					<int key="IBUIInterfaceOrientation">1</int>
+					<int key="interfaceOrientation">1</int>
+				</object>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+				<bool key="IBUIHorizontal">NO</bool>
+			</object>
+			<object class="IBUIViewController" id="1045229907">
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 					<int key="IBUIInterfaceOrientation">1</int>
@@ -312,7 +321,7 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">friendsListViewController</string>
 						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="824014421"/>
+						<reference key="destination" ref="666299817"/>
 					</object>
 					<int key="connectionID">135</int>
 				</object>
@@ -320,10 +329,18 @@
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">userProfileViewController</string>
 						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="181086508"/>
+						<reference key="destination" ref="1045229907"/>
 					</object>
 					<int key="connectionID">142</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">findSitesViewController</string>
+						<reference key="source" ref="664661524"/>
+						<reference key="destination" ref="925352312"/>
+					</object>
+					<int key="connectionID">144</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">appDelegate</string>
@@ -399,11 +416,19 @@
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">appDelegate</string>
-						<reference key="source" ref="824014421"/>
+						<reference key="source" ref="666299817"/>
 						<reference key="destination" ref="664661524"/>
 					</object>
 					<int key="connectionID">136</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">appDelegate</string>
+						<reference key="source" ref="925352312"/>
+						<reference key="destination" ref="664661524"/>
+					</object>
+					<int key="connectionID">145</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -520,12 +545,17 @@
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">134</int>
-						<reference key="object" ref="824014421"/>
+						<reference key="object" ref="666299817"/>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">141</int>
-						<reference key="object" ref="181086508"/>
+						<reference key="object" ref="1045229907"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">143</int>
+						<reference key="object" ref="925352312"/>
 						<reference key="parent" ref="0"/>
 					</object>
 				</object>
@@ -557,6 +587,8 @@
 					<string>134.IBPluginDependency</string>
 					<string>141.CustomClassName</string>
 					<string>141.IBPluginDependency</string>
+					<string>143.CustomClassName</string>
+					<string>143.IBPluginDependency</string>
 					<string>3.CustomClassName</string>
 					<string>3.IBPluginDependency</string>
 					<string>39.IBPluginDependency</string>
@@ -594,6 +626,8 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UserProfileViewController</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>FindSitesViewController</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>NewsBlurAppDelegate</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -619,7 +653,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">142</int>
+			<int key="maxID">145</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1092,6 +1126,53 @@
 						<string key="minorKey">./Classes/FeedsMenuViewController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">FindSitesViewController</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>sitesSearchBar</string>
+							<string>sitesTable</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NewsBlurAppDelegate</string>
+							<string>UISearchBar</string>
+							<string>UITableView</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>sitesSearchBar</string>
+							<string>sitesTable</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">sitesSearchBar</string>
+								<string key="candidateClassName">UISearchBar</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">sitesTable</string>
+								<string key="candidateClassName">UITableView</string>
+							</object>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/FindSitesViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FirstTimeUserAddFriendsViewController</string>
 					<string key="superclassName">UIViewController</string>
@@ -1692,20 +1773,20 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FriendsListViewController</string>
-					<string key="superclassName">UITableViewController</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>searchBar</string>
-							<string>searchDisplayController</string>
+							<string>friendSearchBar</string>
+							<string>friendsTable</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>NewsBlurAppDelegate</string>
 							<string>UISearchBar</string>
-							<string>UISearchDisplayController</string>
+							<string>UITableView</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1713,8 +1794,8 @@
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<string>appDelegate</string>
-							<string>searchBar</string>
-							<string>searchDisplayController</string>
+							<string>friendSearchBar</string>
+							<string>friendsTable</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1723,12 +1804,12 @@
 								<string key="candidateClassName">NewsBlurAppDelegate</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">searchBar</string>
+								<string key="name">friendSearchBar</string>
 								<string key="candidateClassName">UISearchBar</string>
 							</object>
 							<object class="IBToOneOutletInfo">
-								<string key="name">searchDisplayController</string>
-								<string key="candidateClassName">UISearchDisplayController</string>
+								<string key="name">friendsTable</string>
+								<string key="candidateClassName">UITableView</string>
 							</object>
 						</object>
 					</object>
@@ -2175,6 +2256,7 @@
 							<string>feedDetailViewController</string>
 							<string>feedsMenuViewController</string>
 							<string>feedsViewController</string>
+							<string>findSitesViewController</string>
 							<string>firstTimeUserAddFriendsViewController</string>
 							<string>firstTimeUserAddNewsBlurViewController</string>
 							<string>firstTimeUserAddSitesViewController</string>
@@ -2201,6 +2283,7 @@
 							<string>FeedDetailViewController</string>
 							<string>FeedsMenuViewController</string>
 							<string>NewsBlurViewController</string>
+							<string>FindSitesViewController</string>
 							<string>FirstTimeUserAddFriendsViewController</string>
 							<string>FirstTimeUserAddNewsBlurViewController</string>
 							<string>FirstTimeUserAddSitesViewController</string>
@@ -2230,6 +2313,7 @@
 							<string>feedDetailViewController</string>
 							<string>feedsMenuViewController</string>
 							<string>feedsViewController</string>
+							<string>findSitesViewController</string>
 							<string>firstTimeUserAddFriendsViewController</string>
 							<string>firstTimeUserAddNewsBlurViewController</string>
 							<string>firstTimeUserAddSitesViewController</string>
@@ -2274,6 +2358,10 @@
 								<string key="name">feedsViewController</string>
 								<string key="candidateClassName">NewsBlurViewController</string>
 							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">findSitesViewController</string>
+								<string key="candidateClassName">FindSitesViewController</string>
+							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">firstTimeUserAddFriendsViewController</string>
 								<string key="candidateClassName">FirstTimeUserAddFriendsViewController</string>
@@ -2360,6 +2448,7 @@
 							<string>sectionUntapped:</string>
 							<string>sectionUntappedOutside:</string>
 							<string>selectIntelligence</string>
+							<string>tapAddSite:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2367,6 +2456,7 @@
 							<string>UIButton</string>
 							<string>UIButton</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
@@ -2377,6 +2467,7 @@
 							<string>sectionUntapped:</string>
 							<string>sectionUntappedOutside:</string>
 							<string>selectIntelligence</string>
+							<string>tapAddSite:</string>
 						</object>
 						<object class="NSArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2396,6 +2487,10 @@
 								<string key="name">selectIntelligence</string>
 								<string key="candidateClassName">id</string>
 							</object>
+							<object class="IBActionInfo">
+								<string key="name">tapAddSite:</string>
+								<string key="candidateClassName">id</string>
+							</object>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">