Merge branch 'master' of github.com:facebook/three20 into v1.0

Author: jwang

AUTHORS

@@ -9,6 +9,7 @@ Current Maintainers
 -------------------
 Owen Yamauchi    github.com/oyamauchi      [email protected]
 Jeff Verkoeyen   github.com/jverkoey       [email protected]
+John Wang        github.com/jwang          [email protected]
 
 Contributors
 ------------

README.mdown

@@ -19,13 +19,17 @@ If you would like to ask any questions regarding Three20, please check out any o
 
 * [Three20.info][]
 * [Three20 Mailing List][]
-* [Three20 Scope][]
+* [Three20 Tagged Questions on StackOverflow][]
 
 Adding Three20 to your project
 ==============================
 
-Three20 is compiled as a static library, and the easiest way to add it to your
-project is to use Xcode's "dependent project" facilities.  Here is how:  
+Three20 is compiled as static libraries. It use Xcode's "dependent project" facilities.
+There are two methods of adding Three20 to your project.
+
+The first is with the [TTModule Python Script][].
+
+The Second option is to add it to your project manually.  Here is how:  
 **Estimated time:** 5 minutes.
 
 1. Clone the three20 git repository: `git clone git://github.com/facebook/three20.git`.  Make sure 
@@ -155,7 +159,7 @@ Learn more at [Three20.info][]
 [Facebook iPhone app]: http://phobos.apple.com/WebObjects/MZStore.woa/wa/viewSoftware?id=284882215&mt=8
 [Three20.info]: http://Three20.info
 [Three20 Mailing List]: http://groups.google.com/group/three20/
-[Three20 Scope]: http://three20.stackexchange.com
+[Three20 Tagged Questions on StackOverflow]: http://stackoverflow.com/questions/tagged/three20
 [TTPhotoViewController]: http://github.com/facebook/three20/blob/master/src/Three20UI/Headers/TTPhotoViewController.h
 [TTMessageController]: http://github.com/facebook/three20/blob/master/src/Three20UI/Headers/TTMessageController.h
 [TTImageView]: http://github.com/facebook/three20/blob/master/src/Three20UI/Headers/TTImageView.h
@@ -165,3 +169,4 @@ Learn more at [Three20.info][]
 [TTTextEditor]: http://github.com/facebook/three20/blob/master/src/Three20UI/Headers/TTTextEditor.h
 [TTPickerTextField]: http://github.com/facebook/three20/blob/master/src/Three20UI/Headers/TTPickerTextField.h
 [TTNavigator]: http://github.com/facebook/three20/blob/master/src/Three20UI/Headers/TTNavigator.h
+[TTModule Python Script]: http://three20.info/article/2010-10-06-Adding-Three20-To-Your-Project

samples/TTNavigatorDemo/Classes/ContentController.m

@@ -69,7 +69,7 @@ - (id)initWithNutrition:(NSString*)food {
 
 - (id)initWithAbout:(NSString*)about {
   if (self = [super init]) {
-    _contentType = ContentTypeNutrition;
+    _contentType = ContentTypeAbout;
     self.content = about;
     self.text = [NSString stringWithFormat:@"<b>%@</b> is the name of this page.  Exciting.", about];
 
@@ -113,6 +113,9 @@ - (void)loadView {
     self.view.backgroundColor = [UIColor grayColor];
     label.backgroundColor = self.view.backgroundColor;
     self.hidesBottomBarWhenPushed = YES;
+  } else if (_contentType == ContentTypeAbout) {
+	  self.view.backgroundColor = [UIColor grayColor];
+	  label.backgroundColor = self.view.backgroundColor;
   } else if (_contentType == ContentTypeOrder) {
     UIButton* button = [UIButton buttonWithType:UIButtonTypeRoundedRect];
     [button setTitle:@"What do you want to eat?" forState:UIControlStateNormal];

src/Three20UI/Sources/TTSectionedDataSource.m

@@ -219,7 +219,7 @@ - (BOOL)removeItemAtIndexPath:(NSIndexPath*)indexPath andSectionIfEmpty:(BOOL)an
   if (_sections.count) {
     NSMutableArray* items = [_items objectAtIndex:indexPath.section];
     [items removeObjectAtIndex:indexPath.row];
-    if (!items.count) {
+    if (andSection && !items.count) {
       [_sections removeObjectAtIndex:indexPath.section];
       [_items removeObjectAtIndex:indexPath.section];
       return YES;

src/Three20UI/Sources/TTTableMessageItemCell.m

@@ -148,7 +148,7 @@ - (void)layoutSubviews {
     _timestampLabel.top = _titleLabel.top;
     _titleLabel.width -= _timestampLabel.width + kTableCellSmallMargin*2;
   } else {
-    _titleLabel.frame = CGRectZero;
+    _timestampLabel.frame = CGRectZero;
   }
 }
 

src/Three20UI/Sources/TTWebController.m

@@ -317,6 +317,7 @@ - (void)webViewDidStartLoad:(UIWebView*)webView {
   if (!self.navigationItem.rightBarButtonItem) {
     [self.navigationItem setRightBarButtonItem:_activityItem animated:YES];
   }
+  [UIApplication sharedApplication].networkActivityIndicatorVisible = YES;
   [_toolbar replaceItemWithTag:3 withItem:_stopButton];
   _backButton.enabled = [_webView canGoBack];
   _forwardButton.enabled = [_webView canGoForward];
@@ -326,7 +327,7 @@ - (void)webViewDidStartLoad:(UIWebView*)webView {
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 - (void)webViewDidFinishLoad:(UIWebView*)webView {
   TT_RELEASE_SAFELY(_loadingURL);
-
+  [UIApplication sharedApplication].networkActivityIndicatorVisible = NO;
   self.title = [_webView stringByEvaluatingJavaScriptFromString:@"document.title"];
   if (self.navigationItem.rightBarButtonItem == _activityItem) {
     [self.navigationItem setRightBarButtonItem:nil animated:YES];