Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixing missing share dialog on original page on ipad.

  • Loading branch information...
commit 25f158e2ccacd09f894ebcd36a0fa153b06c9c46 1 parent 76ca358
@samuelclay authored
View
2  apps/categories/models.py
@@ -59,7 +59,7 @@ def reload_sites(cls, category_title=None):
try:
category = cls.objects.get(title=category_title)
except cls.DoesNotExist, e:
- print " ***> Missing category: %s" % e
+ print " ***> Missing category: %s" % category_title
continue
category.feed_ids = [site.feed_id for site in sites]
category.save()
View
2  media/ios/Classes/OriginalStoryViewController.m
@@ -301,7 +301,7 @@ - (IBAction)doOpenActionSheet {
NSString *title = [appDelegate.activeStory
objectForKey:@"story_title"];
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
- [ShareThis showShareOptionsToShareUrl:url title:title image:nil onViewController:self.appDelegate.masterContainerViewController];
+ [ShareThis showShareOptionsToShareUrl:url title:title image:nil onViewController:self];
} else {
[ShareThis showShareOptionsToShareUrl:url title:title image:nil onViewController:self];
}
View
128 media/ios/Resources-iPad/Classes/OriginalStoryViewController~ipad.xib
@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1552</int>
- <string key="IBDocument.SystemVersion">12C3006</string>
+ <string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
- <string key="IBDocument.AppKitVersion">1187.34</string>
- <string key="IBDocument.HIToolboxVersion">625.00</string>
+ <string key="IBDocument.AppKitVersion">1187.37</string>
+ <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="NS.object.0">2083</string>
@@ -190,6 +190,14 @@
</object>
<int key="connectionID">7</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBCocoaTouchEventConnection" key="connection">
+ <string key="label">doOpenActionSheet</string>
+ <reference key="source" ref="999347824"/>
+ <reference key="destination" ref="372490531"/>
+ </object>
+ <int key="connectionID">68</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -318,7 +326,7 @@
<reference key="dict.values" ref="0"/>
</object>
<nil key="sourceID"/>
- <int key="maxID">67</int>
+ <int key="maxID">68</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -764,6 +772,7 @@
<string>spacer3BarButton</string>
<string>spacerBarButton</string>
<string>storyTitlesTable</string>
+ <string>titleImageBarButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -776,6 +785,7 @@
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UITableView</string>
+ <string>UIBarButtonItem</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -791,6 +801,7 @@
<string>spacer3BarButton</string>
<string>spacerBarButton</string>
<string>storyTitlesTable</string>
+ <string>titleImageBarButton</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -830,6 +841,10 @@
<string key="name">storyTitlesTable</string>
<string key="candidateClassName">UITableView</string>
</object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">titleImageBarButton</string>
+ <string key="candidateClassName">UIBarButtonItem</string>
+ </object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -878,53 +893,6 @@
</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>
<object class="NSMutableDictionary" key="actions">
@@ -1839,7 +1807,6 @@
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
- <string>findSitesViewController</string>
<string>firstTimeUserAddFriendsViewController</string>
<string>firstTimeUserAddNewsBlurViewController</string>
<string>firstTimeUserAddSitesViewController</string>
@@ -1868,7 +1835,6 @@
<string>FeedDetailViewController</string>
<string>FeedsMenuViewController</string>
<string>NewsBlurViewController</string>
- <string>FindSitesViewController</string>
<string>FirstTimeUserAddFriendsViewController</string>
<string>FirstTimeUserAddNewsBlurViewController</string>
<string>FirstTimeUserAddSitesViewController</string>
@@ -1900,7 +1866,6 @@
<string>feedDetailViewController</string>
<string>feedsMenuViewController</string>
<string>feedsViewController</string>
- <string>findSitesViewController</string>
<string>firstTimeUserAddFriendsViewController</string>
<string>firstTimeUserAddNewsBlurViewController</string>
<string>firstTimeUserAddSitesViewController</string>
@@ -1951,10 +1916,6 @@
<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>
</object>
@@ -2615,13 +2576,14 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>activity</string>
<string>appDelegate</string>
<string>bottomPlaceholderToolbar</string>
<string>buttonAction</string>
<string>buttonNext</string>
<string>buttonPrevious</string>
+ <string>circularProgressView</string>
<string>fontSettingsButton</string>
+ <string>loadingIndicator</string>
<string>originalStoryButton</string>
<string>pageControl</string>
<string>progressView</string>
@@ -2633,20 +2595,21 @@
<string>spacer3BarButton</string>
<string>spacerBarButton</string>
<string>subscribeButton</string>
- <string>toolbar</string>
+ <string>traverseView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>UIBarButtonItem</string>
<string>NewsBlurAppDelegate</string>
<string>UIToolbar</string>
<string>UIBarButtonItem</string>
+ <string>UIButton</string>
+ <string>UIButton</string>
+ <string>THCircularProgressView</string>
<string>UIBarButtonItem</string>
- <string>UIBarButtonItem</string>
- <string>UIBarButtonItem</string>
+ <string>UIActivityIndicatorView</string>
<string>UIBarButtonItem</string>
<string>UIPageControl</string>
- <string>UIProgressView</string>
+ <string>UIView</string>
<string>UIView</string>
<string>TransparentToolbar</string>
<string>UIScrollView</string>
@@ -2655,20 +2618,21 @@
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
<string>UIBarButtonItem</string>
- <string>UIToolbar</string>
+ <string>UIView</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>activity</string>
<string>appDelegate</string>
<string>bottomPlaceholderToolbar</string>
<string>buttonAction</string>
<string>buttonNext</string>
<string>buttonPrevious</string>
+ <string>circularProgressView</string>
<string>fontSettingsButton</string>
+ <string>loadingIndicator</string>
<string>originalStoryButton</string>
<string>pageControl</string>
<string>progressView</string>
@@ -2680,15 +2644,11 @@
<string>spacer3BarButton</string>
<string>spacerBarButton</string>
<string>subscribeButton</string>
- <string>toolbar</string>
+ <string>traverseView</string>
</object>
<object class="NSArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
- <string key="name">activity</string>
- <string key="candidateClassName">UIBarButtonItem</string>
- </object>
- <object class="IBToOneOutletInfo">
<string key="name">appDelegate</string>
<string key="candidateClassName">NewsBlurAppDelegate</string>
</object>
@@ -2702,17 +2662,25 @@
</object>
<object class="IBToOneOutletInfo">
<string key="name">buttonNext</string>
- <string key="candidateClassName">UIBarButtonItem</string>
+ <string key="candidateClassName">UIButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">buttonPrevious</string>
- <string key="candidateClassName">UIBarButtonItem</string>
+ <string key="candidateClassName">UIButton</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">circularProgressView</string>
+ <string key="candidateClassName">THCircularProgressView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">fontSettingsButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
+ <string key="name">loadingIndicator</string>
+ <string key="candidateClassName">UIActivityIndicatorView</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">originalStoryButton</string>
<string key="candidateClassName">UIBarButtonItem</string>
</object>
@@ -2722,7 +2690,7 @@
</object>
<object class="IBToOneOutletInfo">
<string key="name">progressView</string>
- <string key="candidateClassName">UIProgressView</string>
+ <string key="candidateClassName">UIView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">progressViewContainer</string>
@@ -2757,8 +2725,8 @@
<string key="candidateClassName">UIBarButtonItem</string>
</object>
<object class="IBToOneOutletInfo">
- <string key="name">toolbar</string>
- <string key="candidateClassName">UIToolbar</string>
+ <string key="name">traverseView</string>
+ <string key="candidateClassName">UIView</string>
</object>
</object>
</object>
@@ -2768,6 +2736,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">THCircularProgressView</string>
+ <string key="superclassName">UIView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/THCircularProgressView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">TrainerViewController</string>
<string key="superclassName">BaseViewController</string>
<object class="NSMutableDictionary" key="actions">
View
2,549 media/ios/Resources-iPhone/OriginalStoryViewController.xib
4 additions, 2,545 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.