Fixing trainer and profile for use on ipad.

clients/ios/Classes/NBContainerViewController.m

@@ -16,6 +16,7 @@
 #import "UserProfileViewController.h"
 #import "InteractionCell.h"
 #import "ActivityCell.h"
+#import "FeedTableCell.h"
 #import "FeedsMenuViewController.h"
 #import "FeedDetailMenuViewController.h"
 #import "FontSettingsViewController.h"
@@ -206,10 +207,17 @@
         [sender class] == [ActivityCell class]) {
         InteractionCell *cell = (InteractionCell *)sender;
         
-        [popoverController presentPopoverFromRect:cell.bounds 
-                                                inView:cell
-                              permittedArrowDirections:UIPopoverArrowDirectionAny 
-                                              animated:YES];
+        [popoverController presentPopoverFromRect:cell.bounds
+                                           inView:cell
+                         permittedArrowDirections:UIPopoverArrowDirectionAny
+                                         animated:YES];
+    } else if ([sender class] == [FeedTableCell class]) {
+            FeedTableCell *cell = (FeedTableCell *)sender;
+            
+            [popoverController presentPopoverFromRect:cell.bounds
+                                               inView:cell
+                             permittedArrowDirections:UIPopoverArrowDirectionAny
+                                             animated:YES];
     } else if ([sender class] == [UIBarButtonItem class]) {
         [popoverController presentPopoverFromBarButtonItem:sender 
                                   permittedArrowDirections:UIPopoverArrowDirectionAny 
@@ -312,6 +320,12 @@
        [popoverController presentPopoverFromBarButtonItem:sender
                                  permittedArrowDirections:UIPopoverArrowDirectionAny
                                                  animated:NO];
+    } else if ([sender class] == [FeedTableCell class]) {
+        FeedTableCell *cell = (FeedTableCell *)sender;
+        [popoverController presentPopoverFromRect:cell.bounds
+                                           inView:cell
+                         permittedArrowDirections:UIPopoverArrowDirectionAny
+                                         animated:YES];
     } else {
        CGRect frame = [sender CGRectValue];
        [popoverController presentPopoverFromRect:frame

clients/ios/Classes/NewsBlurAppDelegate.h

@@ -270,7 +270,7 @@
 
 - (void)showMoveSite;
 - (void)openTrainSite;
-- (void)openTrainSiteWithFeedLoaded:(BOOL)feedLoaded;
+- (void)openTrainSiteWithFeedLoaded:(BOOL)feedLoaded from:(id)sender;
 - (void)openTrainStory:(id)sender;
 - (void)loadFeedDetailView;
 - (void)loadTryFeedDetailView:(NSString *)feedId withStory:(NSString *)contentId isSocial:(BOOL)social withUser:(NSDictionary *)user showFindingStory:(BOOL)showHUD;

clients/ios/Classes/NewsBlurAppDelegate.m

@@ -557,10 +557,10 @@
 }
 
 - (void)openTrainSite {
-    [self openTrainSiteWithFeedLoaded:YES];
+    [self openTrainSiteWithFeedLoaded:YES from:self.feedDetailViewController.settingsBarButton];
 }
 
-- (void)openTrainSiteWithFeedLoaded:(BOOL)feedLoaded {
+- (void)openTrainSiteWithFeedLoaded:(BOOL)feedLoaded from:(id)sender {
     UINavigationController *navController = self.navigationController;
     trainerViewController.feedTrainer = YES;
     trainerViewController.storyTrainer = NO;
@@ -569,7 +569,7 @@
     if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
 //        trainerViewController.modalPresentationStyle=UIModalPresentationFormSheet;
 //        [navController presentViewController:trainerViewController animated:YES completion:nil];
-        [self.masterContainerViewController showTrainingPopover:self.feedDetailViewController.settingsBarButton];
+        [self.masterContainerViewController showTrainingPopover:sender];
     } else {
         if (self.trainNavigationController == nil) {
             self.trainNavigationController = [[UINavigationController alloc]

clients/ios/Classes/NewsBlurViewController.m

@@ -1119,7 +1119,7 @@ heightForHeaderInSection:(NSInteger)section {
         } else {
             // Train
             appDelegate.activeFeed = [appDelegate.dictFeeds objectForKey:feedId];
-            [appDelegate openTrainSiteWithFeedLoaded:NO];
+            [appDelegate openTrainSiteWithFeedLoaded:NO from:cell];
         }
     } else if (state == MCSwipeTableViewCellState3) {
         // Mark read

clients/ios/NewsBlur_Prefix.pch

@@ -5,7 +5,7 @@
     #import <SystemConfiguration/SystemConfiguration.h>
     #import <MobileCoreServices/MobileCoreServices.h>
 
-#define DEBUG 1
+//#define DEBUG 1
 
 #ifdef DEBUG
     #define BACKGROUND_REFRESH_SECONDS -5