Merge lp:~threeve/ubuntuone-ios-files/polish-and-shine-2 into lp:ubuntuone-ios-files

[Jason Foreman]

Just a few more tweaks to make the app a little bit happier.

[Zachery Bir (urbanape)]

woot!

review: Approve

=== modified file 'Files.xcodeproj/project.pbxproj'
--- Files.xcodeproj/project.pbxproj	2011-12-13 16:43:36 +0000
+++ Files.xcodeproj/project.pbxproj	2011-12-13 20:52:29 +0000
@@ -47,7 +47,7 @@
 		960D46211409ECC500B73177 /* ic_folder.png in Resources */ = {isa = PBXBuildFile; fileRef = 960D461F1409ECC500B73177 /* ic_folder.png */; };
 		960D46221409ECC500B73177 /* [e-mail] in Resources */ = {isa = PBXBuildFile; fileRef = 960D46201409ECC500B73177 /* [e-mail] */; };
 		960D4625140D8AF300B73177 /* U1ByteSizeValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 960D4624140D8AF200B73177 /* U1ByteSizeValueTransformer.m */; };
-		960D4628140D8B4400B73177 /* U1FriendlyDateValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 960D4627140D8B4400B73177 /* U1FriendlyDateValueTransformer.m */; };
+		960D4628140D8B4400B73177 /* U1FuzzyDateTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 960D4627140D8B4400B73177 /* U1FuzzyDateTransformer.m */; };
 		960D462B140D99DD00B73177 /* U1Node.m in Sources */ = {isa = PBXBuildFile; fileRef = 960D462A140D99DC00B73177 /* U1Node.m */; };
 		960D462E140DD22800B73177 /* U1FileNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 960D462D140DD22600B73177 /* U1FileNode.m */; };
 		960D4631140DD23600B73177 /* U1FolderNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 960D4630140DD23400B73177 /* U1FolderNode.m */; };
@@ -227,8 +227,8 @@
 		960D46201409ECC500B73177 /* [e-mail] */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "[e-mail]"; path = "Assets/[e-mail]"; sourceTree = "<group>"; };
 		960D4623140D8AF200B73177 /* U1ByteSizeValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1ByteSizeValueTransformer.h; sourceTree = "<group>"; };
 		960D4624140D8AF200B73177 /* U1ByteSizeValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1ByteSizeValueTransformer.m; sourceTree = "<group>"; };
-		960D4626140D8B4400B73177 /* U1FriendlyDateValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1FriendlyDateValueTransformer.h; sourceTree = "<group>"; };
-		960D4627140D8B4400B73177 /* U1FriendlyDateValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1FriendlyDateValueTransformer.m; sourceTree = "<group>"; };
+		960D4626140D8B4400B73177 /* U1FuzzyDateTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; path = U1FuzzyDateTransformer.h; sourceTree = "<group>"; };
+		960D4627140D8B4400B73177 /* U1FuzzyDateTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1FuzzyDateTransformer.m; sourceTree = "<group>"; };
 		960D4629140D99DB00B73177 /* U1Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1Node.h; sourceTree = "<group>"; };
 		960D462A140D99DC00B73177 /* U1Node.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = U1Node.m; sourceTree = "<group>"; };
 		960D462C140DD22400B73177 /* U1FileNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = U1FileNode.h; sourceTree = "<group>"; };
@@ -666,8 +666,8 @@
 				960D461B1409E78E00B73177 /* U1ViewNibLoader.m */,
 				960D4623140D8AF200B73177 /* U1ByteSizeValueTransformer.h */,
 				960D4624140D8AF200B73177 /* U1ByteSizeValueTransformer.m */,
-				960D4626140D8B4400B73177 /* U1FriendlyDateValueTransformer.h */,
-				960D4627140D8B4400B73177 /* U1FriendlyDateValueTransformer.m */,
+				960D4626140D8B4400B73177 /* U1FuzzyDateTransformer.h */,
+				960D4627140D8B4400B73177 /* U1FuzzyDateTransformer.m */,
 				91A5E2DD142B727500EAAC2B /* U1UploadOperation.h */,
 				91A5E2DE142B727500EAAC2B /* U1UploadOperation.m */,
 				965D7EB71429690C00E4754F /* U1NavigationBar.h */,
@@ -1028,7 +1028,7 @@
 				960D46191409E41E00B73177 /* U1FolderItemCell.m in Sources */,
 				960D461C1409E78E00B73177 /* U1ViewNibLoader.m in Sources */,
 				960D4625140D8AF300B73177 /* U1ByteSizeValueTransformer.m in Sources */,
-				960D4628140D8B4400B73177 /* U1FriendlyDateValueTransformer.m in Sources */,
+				960D4628140D8B4400B73177 /* U1FuzzyDateTransformer.m in Sources */,
 				960D462B140D99DD00B73177 /* U1Node.m in Sources */,
 				960D462E140DD22800B73177 /* U1FileNode.m in Sources */,
 				960D4631140DD23600B73177 /* U1FolderNode.m in Sources */,
 
=== modified file 'Files/U1FolderViewController.m'
--- Files/U1FolderViewController.m	2011-12-12 15:24:46 +0000
+++ Files/U1FolderViewController.m	2011-12-13 20:52:29 +0000
@@ -31,11 +31,14 @@
 #import "U1AutoUploadsManager.h"
 #import "U1Node.h"
 #import "UIActionSheet+U1Additions.h"
+#import "U1FuzzyDateTransformer.h"
 
 
 @interface U1FolderViewController () <UINavigationControllerDelegate, UIImagePickerControllerDelegate, NSFetchedResultsControllerDelegate>
+@property (retain) IBOutlet UILabel *footerLabel;
 @property (copy) NSString *resourcePath;
 @property (retain) U1ByteSizeValueTransformer *byteSizeTransformer;
+@property (retain) U1FuzzyDateTransformer *fuzzyDateTransformer;
 @property (retain) NSIndexPath *pendingIndexPath;
 @property (retain) U1FolderNode *node;
 @property (retain) NSMutableArray *nodes;
@@ -50,7 +53,7 @@
 
 @synthesize loadingCell;
 @synthesize delegate, filesClient, node, resourcePath;
-@synthesize byteSizeTransformer, pendingIndexPath, nodes, resultsController;
+@synthesize footerLabel, byteSizeTransformer, fuzzyDateTransformer, pendingIndexPath, nodes, resultsController;
 
 - (id)initWithNodeResourcePath:(NSString*)theResourcePath;
 {
@@ -59,7 +62,8 @@
 		return nil;
 	self.title = [theResourcePath lastPathComponent];
 	self.resourcePath = theResourcePath;
-	self.byteSizeTransformer = [[U1ByteSizeValueTransformer new] autorelease];
+	byteSizeTransformer = [U1ByteSizeValueTransformer new];
+	fuzzyDateTransformer = [U1FuzzyDateTransformer new];
 	filesClient = [U1FilesClient sharedFilesClient];
 	
 	UIBarButtonItem *uploadItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAdd target:self action:@selector(uploadImage:)];
@@ -77,9 +81,11 @@
 	[resourcePath release];
 	[node release];
 	[byteSizeTransformer release];
+	[fuzzyDateTransformer release];
 	[pendingIndexPath release];
 	[nodes release];
 	[resultsController release];
+	[footerLabel release];
 	[super dealloc];
 }
 
@@ -87,11 +93,6 @@
 {
 	[super viewDidLoad];
 	[self refresh];
-	
-	UILongPressGestureRecognizer *longPress = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(longPress:)];
-	[longPress setMinimumPressDuration:1.f];
-	[self.tableView addGestureRecognizer:longPress];
-	[longPress release];
 }
 
 - (void)viewDidUnload;
@@ -130,71 +131,6 @@
 	}
 }
 
-- (void)longPress:(UILongPressGestureRecognizer*)longPress;
-{
-	if (longPress.state == UIGestureRecognizerStateBegan)
-	{
-		CGPoint p = [longPress locationInView:self.tableView];
-		NSIndexPath *indexPath = [self.tableView indexPathForRowAtPoint:p];
-		U1Node *childNode = [self.nodes objectAtIndex:indexPath.row];
-
-		UIActionSheet *actionSheet = [UIActionSheet new];
-		
-		[actionSheet setTitle:[[childNode path] lastPathComponent]];
-		[actionSheet setDestructiveButtonIndex:[actionSheet addButtonWithTitle:@"Delete"]];
-		NSInteger renameButtonIndex = [actionSheet addButtonWithTitle:@"Rename"];
-		NSInteger publishButtonIndex = -1;
-		NSInteger copyURLButtonIndex = -1;
-		if ([childNode isFile])
-		{
-			U1FileNode *fileNode = (id)childNode;
-			if ([[fileNode isPublic] boolValue])
-			{
-				publishButtonIndex = [actionSheet addButtonWithTitle:@"Unpublish"];
-				copyURLButtonIndex = [actionSheet addButtonWithTitle:@"Copy Public URL"];
-			}
-			else
-			{
-				publishButtonIndex = [actionSheet addButtonWithTitle:@"Publish"];
-			}
-		}
-		[actionSheet setCancelButtonIndex:[actionSheet addButtonWithTitle:@"Cancel"]];
-
-		self.pendingIndexPath = indexPath;
-		[actionSheet showInView:self.view withCompletionBlock:^(NSInteger buttonIndex) {
-			if (buttonIndex == [actionSheet destructiveButtonIndex])
-			{
-				[self deleteNodeAtIndexPath:self.pendingIndexPath];
-			}
-			else if (buttonIndex == renameButtonIndex)
-			{
-				NSLog(@"rename!"); // TODO:
-			}
-			else if (buttonIndex == publishButtonIndex)
-			{
-				U1FileNode *fileNode = (id)childNode;
-				if ([[fileNode isPublic] boolValue])
-					[self.filesClient unpublishNode:fileNode completionBlock:^(U1FileNode *updatedNode, NSError *error) {
-					}];
-				else
-					[self.filesClient publishNode:fileNode completionBlock:^(U1FileNode *updatedNode, NSError *error) {
-					}];
-			}
-			else if (buttonIndex == copyURLButtonIndex)
-			{
-				U1FileNode *fileNode = (id)childNode;
-				NSArray *types = UIPasteboardTypeListString;
-				[[UIPasteboard generalPasteboard] setValue:[fileNode publicURLString] forPasteboardType:[types lastObject]];
-			}
-			else if (buttonIndex == [actionSheet cancelButtonIndex])
-			{
-//				NSLog(@"cancel");
-			}
-			self.pendingIndexPath = nil;
-		}];
-	}
-}
-
 - (void)uploadImage:(id)sender;
 {
 	UIImagePickerController *imagePicker = [[UIImagePickerController alloc] init];
@@ -303,7 +239,8 @@
 	if ([aNode isFolder])
 	{
 		[cell.imageView setImage:[UIImage imageNamed:@"ic_folder"]];
-		[cell.detailLabel setText:[aNode.modificationDate description]];
+		NSString *fuzzyDate = [self.fuzzyDateTransformer transformedValue:aNode.modificationDate];
+		[cell.detailLabel setText:[NSString stringWithFormat:@"modified %@", fuzzyDate]];
 	}
 	else
 	{
@@ -318,8 +255,9 @@
 		NSNumber *size = [aNode valueForKey:@"size"];
 		NSString *sizeString = [self.byteSizeTransformer transformedValue:size];
 		NSString *detailString = sizeString;
+		NSString *fuzzyDate = [self.fuzzyDateTransformer transformedValue:aNode.modificationDate];
 		if (aNode.modificationDate)
-			detailString = [sizeString stringByAppendingFormat:@", modified %@", aNode.modificationDate];
+			detailString = [sizeString stringByAppendingFormat:@", modified %@", fuzzyDate];
 		[cell.detailLabel setText:detailString];
 	}
 }
@@ -375,28 +313,6 @@
 	[self loadInfoForNode];
 }
 
-- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section;
-{
-	UILabel *footerLabel = [[[UILabel alloc] initWithFrame:CGRectMake(0, 0, 320, 22)] autorelease];
-	footerLabel.backgroundColor = [[UIColor lightGrayColor] colorWithAlphaComponent:0.85f];
-	[footerLabel setFont:[UIFont systemFontOfSize:14.f]];
-	[footerLabel setShadowColor:[UIColor whiteColor]];
-	[footerLabel setShadowOffset:CGSizeMake(0, 1)];
-	[footerLabel setTextAlignment:UITextAlignmentCenter];
-
-	int numItems = [[[self.resultsController sections] objectAtIndex:0] numberOfObjects];
-	NSNumber *folderRawSize = [[self.resultsController fetchedObjects] valueForKeyPath:@"@sum.size"];
-	NSString *folderSize = [self.byteSizeTransformer transformedValue:folderRawSize];
-	
-	[footerLabel setText:[NSString stringWithFormat:@"%d items, %@", numItems, folderSize]];
-
-	return footerLabel;
-}
-
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section;
-{
-	return 22.0f;
-}
 
 #pragma mark Private Methods
 
@@ -502,6 +418,11 @@
 - (void)controllerDidChangeContent:(NSFetchedResultsController *)controller;
 {
 	[self.tableView endUpdates];
+	
+	int numItems = [[[self.resultsController sections] objectAtIndex:0] numberOfObjects];
+	NSNumber *folderRawSize = [[self.resultsController fetchedObjects] valueForKeyPath:@"@sum.size"];
+	NSString *folderSize = [self.byteSizeTransformer transformedValue:folderRawSize];
+	[self.footerLabel setText:[NSString stringWithFormat:@"%d items, %@", numItems, folderSize]];
 }
 
 @end
 
=== modified file 'Files/U1FolderViewController.xib'
--- Files/U1FolderViewController.xib	2011-12-07 18:23:32 +0000
+++ Files/U1FolderViewController.xib	2011-12-13 20:52:29 +0000
@@ -12,6 +12,7 @@
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>IBUIView</string>
 			<string>IBUITableViewCell</string>
 			<string>IBUITableView</string>
 			<string>IBUIActivityIndicatorView</string>
@@ -39,9 +40,64 @@
 			<object class="IBUITableView" id="174006671">
 				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
+				<object class="NSMutableArray" key="NSSubviews">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBUIView" id="1014635344">
+						<reference key="NSNextResponder" ref="174006671"/>
+						<int key="NSvFlags">292</int>
+						<object class="NSMutableArray" key="NSSubviews">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBUILabel" id="1067115130">
+								<reference key="NSNextResponder" ref="1014635344"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{20, 6}, {280, 18}}</string>
+								<reference key="NSSuperview" ref="1014635344"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<string key="IBUIText"/>
+								<object class="NSColor" key="IBUITextColor">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<int key="IBUIBaselineAdjustment">1</int>
+								<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
+								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUITextAlignment">1</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription">
+									<int key="type">1</int>
+									<double key="pointSize">14</double>
+								</object>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">14</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+						</object>
+						<string key="NSFrame">{{0, 430}, {320, 30}}</string>
+						<reference key="NSSuperview" ref="174006671"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="1067115130"/>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MQA</bytes>
+							<object class="NSColorSpace" key="NSCustomColorSpace">
+								<int key="NSID">2</int>
+							</object>
+						</object>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+				</object>
 				<string key="NSFrameSize">{320, 460}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="1014635344"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MQA</bytes>
@@ -55,9 +111,10 @@
 				<float key="IBUIRowHeight">54</float>
 				<float key="IBUISectionHeaderHeight">22</float>
 				<float key="IBUISectionFooterHeight">22</float>
+				<reference key="IBUITableFooterView" ref="1014635344"/>
 			</object>
 			<object class="IBUITableViewCell" id="864788526">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -71,6 +128,8 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{136, 17}, {75, 21}}</string>
 								<reference key="NSSuperview" ref="834389907"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
 								<int key="IBUIContentMode">7</int>
@@ -101,6 +160,7 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{108, 18}, {20, 20}}</string>
 								<reference key="NSSuperview" ref="834389907"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="317026358"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@@ -111,6 +171,7 @@
 						</object>
 						<string key="NSFrameSize">{320, 53}</string>
 						<reference key="NSSuperview" ref="864788526"/>
+						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="42067442"/>
 						<object class="NSColor" key="IBUIBackgroundColor">
 							<int key="NSColorSpace">3</int>
@@ -124,6 +185,8 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 54}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="834389907"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
@@ -152,6 +215,14 @@
 					</object>
 					<int key="connectionID">13</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">footerLabel</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="1067115130"/>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -178,6 +249,10 @@
 					<object class="IBObjectRecord">
 						<int key="objectID">8</int>
 						<reference key="object" ref="174006671"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1014635344"/>
+						</object>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Table View</string>
 					</object>
@@ -201,6 +276,20 @@
 						<reference key="object" ref="317026358"/>
 						<reference key="parent" ref="864788526"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="1014635344"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1067115130"/>
+						</object>
+						<reference key="parent" ref="174006671"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="1067115130"/>
+						<reference key="parent" ref="1014635344"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -214,6 +303,8 @@
 					<string>10.IBPluginDependency</string>
 					<string>11.IBPluginDependency</string>
 					<string>12.IBPluginDependency</string>
+					<string>18.IBPluginDependency</string>
+					<string>19.IBPluginDependency</string>
 					<string>8.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
@@ -226,6 +317,8 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -240,7 +333,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">17</int>
+			<int key="maxID">20</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -257,14 +350,35 @@
 					<string key="className">U1FolderViewController</string>
 					<string key="superclassName">PullRefreshTableViewController</string>
 					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">loadingCell</string>
-						<string key="NS.object.0">UITableViewCell</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>footerLabel</string>
+							<string>loadingCell</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>UILabel</string>
+							<string>UITableViewCell</string>
+						</object>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">loadingCell</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">loadingCell</string>
-							<string key="candidateClassName">UITableViewCell</string>
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>footerLabel</string>
+							<string>loadingCell</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBToOneOutletInfo">
+								<string key="name">footerLabel</string>
+								<string key="candidateClassName">UILabel</string>
+							</object>
+							<object class="IBToOneOutletInfo">
+								<string key="name">loadingCell</string>
+								<string key="candidateClassName">UITableViewCell</string>
+							</object>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 
=== renamed file 'Files/U1FriendlyDateValueTransformer.h' => 'Files/U1FuzzyDateTransformer.h'
--- Files/U1FriendlyDateValueTransformer.h	2011-08-31 14:56:30 +0000
+++ Files/U1FuzzyDateTransformer.h	2011-12-13 20:52:29 +0000
@@ -16,6 +16,6 @@
 #import <Foundation/Foundation.h>
 
 
-@interface U1FriendlyDateValueTransformer : NSValueTransformer
+@interface U1FuzzyDateTransformer : NSValueTransformer
 
 @end
 
=== renamed file 'Files/U1FriendlyDateValueTransformer.m' => 'Files/U1FuzzyDateTransformer.m'
--- Files/U1FriendlyDateValueTransformer.m	2011-08-31 14:56:30 +0000
+++ Files/U1FuzzyDateTransformer.m	2011-12-13 20:52:29 +0000
@@ -13,18 +13,72 @@
 //  You should have received a copy of the GNU Affero General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#import "U1FriendlyDateValueTransformer.h"
-
-
-@implementation U1FriendlyDateValueTransformer
+#import "U1FuzzyDateTransformer.h"
+
+
+static const NSUInteger kSECONDS_PER_MINUTE = 60;
+static const NSUInteger kSECONDS_PER_HOUR = 60 * kSECONDS_PER_MINUTE;
+static const NSUInteger kSECONDS_PER_DAY = 24 * kSECONDS_PER_HOUR;
+static const NSUInteger kSECONDS_PER_WEEK = 7 * kSECONDS_PER_DAY;
+static const NSUInteger kABOUT_A_WEEK = kSECONDS_PER_WEEK + kSECONDS_PER_DAY;
+
+
+@implementation U1FuzzyDateTransformer
 
 + (Class)transformedValueClass { return [NSString class]; }
 
 + (BOOL)allowsReverseTransformation { return NO; }
 
++ (NSDateFormatter*)dateFormatter;
+{
+	static NSDateFormatter *dateFormatter = nil;
+	static dispatch_once_t onceToken;
+	dispatch_once(&onceToken, ^{
+		dateFormatter = [[NSDateFormatter alloc] init];
+		[dateFormatter setDateStyle:NSDateFormatterShortStyle];
+	});
+	return dateFormatter;
+}
+
 - (id)transformedValue:(id)value;
 {
-    return (value == nil) ? nil : NSStringFromClass([value class]);
+	NSDate *date = value;
+	NSTimeInterval interval = -[date timeIntervalSinceNow];
+	
+	
+	NSString *fuzzyDate = nil;
+	if (interval < kSECONDS_PER_MINUTE)
+	{
+		return NSLocalizedString(@"just now", nil);
+	}
+	else if (interval < kSECONDS_PER_HOUR)
+	{
+		NSUInteger minutes = interval / kSECONDS_PER_MINUTE;
+		NSString *format = (minutes > 1) ? NSLocalizedString(@"%u minutes ago", nil) : NSLocalizedString(@"%u minute ago", nil);
+		fuzzyDate = [NSString stringWithFormat:format, minutes];
+	}
+	else if (interval < kSECONDS_PER_DAY)
+	{
+		NSUInteger hours = interval / kSECONDS_PER_HOUR;
+		NSString *format = (hours > 1) ? NSLocalizedString(@"%u hours ago", nil) : NSLocalizedString(@"%u hour ago", nil);
+		fuzzyDate = [NSString stringWithFormat:format, hours];
+	}
+	else if (interval < kSECONDS_PER_WEEK)
+	{
+		NSUInteger days = interval / kSECONDS_PER_DAY;
+		NSString *format = (days > 1) ? NSLocalizedString(@"%u days ago", nil) : NSLocalizedString(@"%u day ago", nil);
+		fuzzyDate = [NSString stringWithFormat:format, days];
+	}
+	else if (interval < kABOUT_A_WEEK)
+	{
+		return NSLocalizedString(@"1 week ago", nil);
+	}
+	else
+	{
+		fuzzyDate = [[U1FuzzyDateTransformer dateFormatter] stringFromDate:date];
+	}
+	
+    return fuzzyDate;
 }
 
 @end
 
=== modified file 'Files/U1SettingsViewController.h'
--- Files/U1SettingsViewController.h	2011-12-06 02:55:27 +0000
+++ Files/U1SettingsViewController.h	2011-12-13 20:52:29 +0000
@@ -33,7 +33,6 @@
 @property (retain) IBOutlet UILabel *disableSleepToggleLabel;
 @property (retain) IBOutlet UISwitch *disableSleepToggle;
 @property (retain) IBOutlet UITableView *tableView;
-@property (retain) IBOutlet UIView *signOutView;
 
 - (IBAction)toggleAutoUpload:(id)sender;
 - (IBAction)toggleWifiOnly:(id)sender;
 
=== modified file 'Files/U1SettingsViewController.m'
--- Files/U1SettingsViewController.m	2011-12-12 15:24:46 +0000
+++ Files/U1SettingsViewController.m	2011-12-13 20:52:29 +0000
@@ -27,7 +27,7 @@
 static const NSUInteger U1SettingsViewSectionCount = 2;
 
 
-@interface U1SettingsViewController ()
+@interface U1SettingsViewController () <UIActionSheetDelegate>
 @property (readonly, nonatomic, retain) UITableViewCell *accountLoadingCell;
 @property (retain) U1FilesClient *filesClient;
 @property (retain) NSDictionary *accountInfo;
@@ -45,7 +45,7 @@
 @synthesize wifiOnlyToggleCell, wifiOnlyToggleLabel, wifiOnlyToggle;
 @synthesize includeVideoToggleCell, includeVideoToggleLabel, includeVideoToggle;
 @synthesize disableSleepToggleCell, disableSleepToggleLabel, disableSleepToggle;
-@synthesize accountLoadingCell, filesClient, accountInfo, signOutView;
+@synthesize accountLoadingCell, filesClient, accountInfo;
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
@@ -74,7 +74,6 @@
 	[disableSleepToggle release];
 	[filesClient release];
 	[accountInfo release];
-	[signOutView release];
 	[super dealloc];
 }
 
@@ -94,13 +93,24 @@
 	[self.filesClient accountInfoWithCompletionBlock:^(NSDictionary *fetchedAccountInfo, NSError *error) {
 		self.accountInfo = fetchedAccountInfo;
 		if (self.accountInfo)
-			[self.tableView reloadSections:[NSIndexSet indexSetWithIndex:U1SettingsViewSectionAccount] withRowAnimation:UITableViewRowAnimationFade];
+			[self.tableView reloadSections:[NSIndexSet indexSetWithIndex:U1SettingsViewSectionAccount] withRowAnimation:UITableViewRowAnimationNone];
 	}];
 }
 
 - (IBAction)signOut:(id)sender;
 {
-	[[U1AccountManager sharedAccountManager] removeCredentials];
+	// TODO: get actual copy for this from design team
+	UIActionSheet *actionSheet = [[UIActionSheet alloc] initWithTitle:@"Logging out from this device will not affect other devices connected to Ubuntu One." delegate:self cancelButtonTitle:@"Cancel" destructiveButtonTitle:@"Log Out" otherButtonTitles:nil];
+	[actionSheet showFromTabBar:self.tabBarController.tabBar];
+	[actionSheet release];
+}
+
+- (void)actionSheet:(UIActionSheet *)actionSheet didDismissWithButtonIndex:(NSInteger)buttonIndex;
+{
+	if ([actionSheet destructiveButtonIndex] == buttonIndex)
+	{
+		[[U1AccountManager sharedAccountManager] removeCredentials];
+	}
 }
 
 - (void)toggleAutoUpload:(id)sender;
@@ -167,20 +177,13 @@
 	switch (section)
 	{
 		case U1SettingsViewSectionAccount:
-			return self.accountInfo == nil ? 1 : 2;
+			return 3;
 		case U1SettingsViewSectionCameraRoll:
 			return 3; // TODO const
 	}
 	return 0;
 }
 
-- (CGFloat)tableView:(UITableView *)tableView heightForFooterInSection:(NSInteger)section;
-{
-	if (section == U1SettingsViewSectionAccount)
-		return 44.0;
-	return [self.tableView sectionFooterHeight];
-}
-
 - (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath;
 {
 	if (indexPath.section == U1SettingsViewSectionCameraRoll &&
@@ -193,58 +196,90 @@
 
 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath;
 {
+	UITableViewCell *cell = nil;
 	switch (indexPath.section)
 	{
 		case U1SettingsViewSectionAccount:
 		{
-			if (self.accountInfo == nil)
-				return [self accountLoadingCell];
-			
-			UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:@"AccountCell"];
-			if (!cell)
-			{
-				cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue2 reuseIdentifier:@"AccountCell"] autorelease];
-			}
 			switch (indexPath.row)
 			{
 				case 0:
+					cell = [self.tableView dequeueReusableCellWithIdentifier:@"AccountCell"];
+					if (!cell)
+					{
+						cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue2 reuseIdentifier:@"AccountCell"] autorelease];
+						[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+					}
 					[cell.textLabel setText:NSLocalizedString(@"Name", nil)];
-					[cell.detailTextLabel setText:[self.accountInfo objectForKey:@"visible_name"]];
+					[cell.detailTextLabel setText:@"Loading..."];
+					if (self.accountInfo)
+						[cell.detailTextLabel setText:[self.accountInfo objectForKey:@"visible_name"]];
 					break;
 				case 1:
 				{
+					cell = [self.tableView dequeueReusableCellWithIdentifier:@"AccountCell"];
+					if (!cell)
+					{
+						cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue2 reuseIdentifier:@"AccountCell"] autorelease];
+						[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
+					}
 					[cell.textLabel setText:NSLocalizedString(@"Storage", nil)];
 					U1ByteSizeValueTransformer *byteSizeTransformer = [[U1ByteSizeValueTransformer alloc] init];
 					NSString *storageFormat = NSLocalizedString(@"%@ of %@ used", nil);
 					NSString *usedString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"used_bytes"]];
 					NSString *totalString = [byteSizeTransformer transformedValue:[self.accountInfo objectForKey:@"max_bytes"]];
-					[cell.detailTextLabel setText:[NSString stringWithFormat:storageFormat, usedString, totalString]];
+					[cell.detailTextLabel setText:@"Loading..."];
+					if (self.accountInfo)
+						[cell.detailTextLabel setText:[NSString stringWithFormat:storageFormat, usedString, totalString]];
 					[byteSizeTransformer release];
 					break;
 				}
+				case 2:
+				{
+					cell = [self.tableView dequeueReusableCellWithIdentifier:@"LogOutCell"];
+					if (!cell)
+					{
+						cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"LogOutCell"] autorelease];
+						[cell.textLabel setTextAlignment:UITextAlignmentCenter];
+						[cell.textLabel setFont:[UIFont boldSystemFontOfSize:17.f]];
+						[cell.textLabel setText:@"Log Out of Ubuntu One"];
+					}
+					break;
+				}
 			}
-			return cell;
+			break;
+//			return cell;
 		}
 		case U1SettingsViewSectionCameraRoll:
 		{
 			switch (indexPath.row)
 			{
-				case 0: return [self preparedAutoUploadCell];
-				case 1: return [self preparedWifiOnlyCell];
-//				case 2: return [self preparedIncludeVideoCell];
-				case 2: return [self preparedDisableSleepCell];
-				default: return nil;
+				case 0: cell = [self preparedAutoUploadCell]; break;
+				case 1: cell = [self preparedWifiOnlyCell]; break;
+//				case 2: cell = [self preparedIncludeVideoCell]; break;
+				case 2: cell = [self preparedDisableSleepCell]; break;
+				default: break;
 			}
+			[cell setSelectionStyle:UITableViewCellSelectionStyleNone];
 		}
 	}
-	return nil;
-}
-
-- (UIView *)tableView:(UITableView *)tableView viewForFooterInSection:(NSInteger)section;
-{
-	if (section == U1SettingsViewSectionAccount)
-		return self.signOutView;
-	return nil;
+	return cell;
+}
+
+- (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath;
+{
+	if (indexPath.section == U1SettingsViewSectionAccount && indexPath.row == 2)
+		return indexPath;
+	return nil;
+}
+
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath;
+{
+	if (indexPath.section == U1SettingsViewSectionAccount && indexPath.row == 2)
+	{
+		[self signOut:nil];
+		[self.tableView deselectRowAtIndexPath:indexPath animated:YES];
+	}
 }
 
 - (UITableViewCell *)preparedAutoUploadCell;
 
=== modified file 'Files/U1SettingsViewController.xib'
--- Files/U1SettingsViewController.xib	2011-12-09 20:31:25 +0000
+++ Files/U1SettingsViewController.xib	2011-12-13 20:52:29 +0000
@@ -11,14 +11,12 @@
 			<string key="NS.object.0">933</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIBarButtonItem</string>
-			<string>IBUILabel</string>
 			<string>IBUISwitch</string>
-			<string>IBUIToolbar</string>
 			<string>IBUITableView</string>
 			<string>IBUITableViewCell</string>
 			<string>IBUIView</string>
+			<string>IBUILabel</string>
+			<string>IBProxyObject</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -112,7 +110,6 @@
 						<int key="IBUIStyle">1</int>
 						<int key="IBUISeparatorStyle">2</int>
 						<int key="IBUISectionIndexMinimumDisplayRowCount">0</int>
-						<bool key="IBUIAllowsSelection">NO</bool>
 						<float key="IBUIRowHeight">44</float>
 						<float key="IBUISectionHeaderHeight">10</float>
 						<float key="IBUISectionFooterHeight">10</float>
@@ -126,7 +123,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUITableViewCell" id="126074602">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="289125020">
@@ -138,8 +135,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{206, 8}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="289125020"/>
-								<reference key="NSWindow"/>
-								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
@@ -150,7 +145,6 @@
 								<int key="NSvFlags">292</int>
 								<string key="NSFrame">{{20, 11}, {193, 21}}</string>
 								<reference key="NSSuperview" ref="289125020"/>
-								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="513262918"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<bool key="IBUIClipsSubviews">YES</bool>
@@ -178,7 +172,6 @@
 						</array>
 						<string key="NSFrameSize">{320, 43}</string>
 						<reference key="NSSuperview" ref="126074602"/>
-						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="866302443"/>
 						<reference key="IBUIBackgroundColor" ref="509795101"/>
 						<bool key="IBUIOpaque">NO</bool>
@@ -189,14 +182,12 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<reference key="NSNextKeyView" ref="289125020"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<reference key="IBUIContentView" ref="289125020"/>
 			</object>
 			<object class="IBUITableViewCell" id="2020695">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="609546111">
@@ -227,7 +218,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{206, 8}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="609546111"/>
-								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
@@ -247,13 +237,12 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
-				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="609546111"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<reference key="IBUIContentView" ref="609546111"/>
 			</object>
 			<object class="IBUITableViewCell" id="703802727">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="849901570">
@@ -284,7 +273,6 @@
 								<int key="NSvFlags">289</int>
 								<string key="NSFrame">{{206, 8}, {94, 27}}</string>
 								<reference key="NSSuperview" ref="849901570"/>
-								<reference key="NSNextKeyView"/>
 								<bool key="IBUIOpaque">NO</bool>
 								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 								<int key="IBUIContentHorizontalAlignment">0</int>
@@ -304,13 +292,12 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 44}</string>
-				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="849901570"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<reference key="IBUIContentView" ref="849901570"/>
 			</object>
 			<object class="IBUITableViewCell" id="328240698">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="61456725">
@@ -388,59 +375,11 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{320, 70}</string>
-				<reference key="NSSuperview"/>
 				<reference key="NSNextKeyView" ref="61456725"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<reference key="IBUIContentView" ref="61456725"/>
 				<real value="70" key="IBUIRowHeight"/>
 			</object>
-			<object class="IBUIView" id="393432936">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">292</int>
-				<array class="NSMutableArray" key="NSSubviews">
-					<object class="IBUIToolbar" id="398717734">
-						<reference key="NSNextResponder" ref="393432936"/>
-						<int key="NSvFlags">266</int>
-						<string key="NSFrameSize">{320, 44}</string>
-						<reference key="NSSuperview" ref="393432936"/>
-						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<bool key="IBUIClearsContextBeforeDrawing">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIBarStyle">2</int>
-						<array class="NSMutableArray" key="IBUIItems">
-							<object class="IBUIBarButtonItem" id="390888023">
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<reference key="IBUIToolbar" ref="398717734"/>
-								<int key="IBUISystemItemIdentifier">5</int>
-							</object>
-							<object class="IBUIBarButtonItem" id="172971356">
-								<string key="IBUITitle">Sign Out of Ubuntu One</string>
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<float key="IBUIWidth">300</float>
-								<int key="IBUIStyle">1</int>
-								<reference key="IBUIToolbar" ref="398717734"/>
-							</object>
-							<object class="IBUIBarButtonItem" id="1054082570">
-								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-								<reference key="IBUIToolbar" ref="398717734"/>
-								<int key="IBUISystemItemIdentifier">5</int>
-							</object>
-						</array>
-						<object class="NSColor" key="IBUITintColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC44IDAgMAA</bytes>
-						</object>
-					</object>
-				</array>
-				<string key="NSFrameSize">{320, 44}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView" ref="398717734"/>
-				<reference key="IBUIBackgroundColor" ref="509795101"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
@@ -550,14 +489,6 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">signOutView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="393432936"/>
-					</object>
-					<int key="connectionID">56</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
 						<string key="label">dataSource</string>
 						<reference key="source" ref="703168831"/>
 						<reference key="destination" ref="372490531"/>
@@ -608,14 +539,6 @@
 					</object>
 					<int key="connectionID">51</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">signOut:</string>
-						<reference key="source" ref="172971356"/>
-						<reference key="destination" ref="372490531"/>
-					</object>
-					<int key="connectionID">59</int>
-				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -731,40 +654,6 @@
 						<reference key="object" ref="792393428"/>
 						<reference key="parent" ref="328240698"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">53</int>
-						<reference key="object" ref="393432936"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="398717734"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Sign Out View</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">54</int>
-						<reference key="object" ref="398717734"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="172971356"/>
-							<reference ref="1054082570"/>
-							<reference ref="390888023"/>
-						</array>
-						<reference key="parent" ref="393432936"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">55</int>
-						<reference key="object" ref="172971356"/>
-						<reference key="parent" ref="398717734"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="1054082570"/>
-						<reference key="parent" ref="398717734"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="390888023"/>
-						<reference key="parent" ref="398717734"/>
-					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -787,18 +676,12 @@
 				<string key="45.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="46.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="50.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="53.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="54.CustomClassName">U1TransparentToolbar</string>
-				<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">59</int>
+			<int key="maxID">61</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -847,7 +730,6 @@
 						<string key="includeVideoToggleCell">UITableViewCell</string>
 						<string key="includeVideoToggleLabel">UILabel</string>
 						<string key="navBar">U1NavigationBar</string>
-						<string key="signOutView">UIView</string>
 						<string key="tableView">UITableView</string>
 						<string key="wifiOnlyToggle">UISwitch</string>
 						<string key="wifiOnlyToggleCell">UITableViewCell</string>
@@ -890,10 +772,6 @@
 							<string key="name">navBar</string>
 							<string key="candidateClassName">U1NavigationBar</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="signOutView">
-							<string key="name">signOutView</string>
-							<string key="candidateClassName">UIView</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="tableView">
 							<string key="name">tableView</string>
 							<string key="candidateClassName">UITableView</string>
@@ -916,14 +794,6 @@
 						<string key="minorKey">./Classes/U1SettingsViewController.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">U1TransparentToolbar</string>
-					<string key="superclassName">UIToolbar</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/U1TransparentToolbar.h</string>
-					</object>
-				</object>
 			</array>
 		</object>
 		<int key="IBDocument.localizationMode">0</int>
 
=== modified file 'Files/UOSSOCredentialsViewController.xib'
--- Files/UOSSOCredentialsViewController.xib	2011-08-31 14:56:30 +0000
+++ Files/UOSSOCredentialsViewController.xib	2011-12-13 20:52:29 +0000
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.10">
 	<data>
-		<int key="IBDocument.SystemTarget">1056</int>
+		<int key="IBDocument.SystemTarget">1280</int>
 		<string key="IBDocument.SystemVersion">10K549</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1306</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1938</string>
 		<string key="IBDocument.AppKitVersion">1038.36</string>
 		<string key="IBDocument.HIToolboxVersion">461.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">301</string>
+			<string key="NS.object.0">933</string>
 		</object>
 		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -24,11 +24,8 @@
 			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys" id="0">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-			</object>
-			<reference key="dict.values" ref="0"/>
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
 		</object>
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -48,7 +45,7 @@
 					<object class="IBUITextField" id="327454090">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{120, 24}, {180, 31}}</string>
+						<string key="NSFrame">{{104, 24}, {196, 31}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="1028176743"/>
@@ -58,7 +55,6 @@
 						<int key="IBUIContentVerticalAlignment">0</int>
 						<string key="IBUIText"/>
 						<int key="IBUIBorderStyle">3</int>
-						<string key="IBUIPlaceholder">[e-mail]</string>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MAA</bytes>
@@ -66,23 +62,29 @@
 								<int key="NSID">2</int>
 							</object>
 						</object>
-						<object class="NSFont" key="IBUIFont">
+						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
+						<float key="IBUIMinimumFontSize">17</float>
+						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
+							<int key="IBUIAutocorrectionType">1</int>
+							<int key="IBUIKeyboardType">7</int>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<string key="name">Helvetica</string>
+							<string key="family">Helvetica</string>
+							<int key="traits">0</int>
+							<double key="pointSize">12</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="9578050">
 							<string key="NSName">Helvetica</string>
 							<double key="NSSize">12</double>
 							<int key="NSfFlags">16</int>
 						</object>
-						<bool key="IBUIAdjustsFontSizeToFit">YES</bool>
-						<float key="IBUIMinimumFontSize">17</float>
-						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
-							<int key="IBUIAutocorrectionType">1</int>
-							<int key="IBUIKeyboardType">7</int>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						</object>
 					</object>
 					<object class="IBUITextField" id="965235407">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{120, 63}, {180, 31}}</string>
+						<string key="NSFrame">{{104, 63}, {196, 31}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="391813410"/>
@@ -92,7 +94,6 @@
 						<int key="IBUIContentVerticalAlignment">0</int>
 						<string key="IBUIText"/>
 						<int key="IBUIBorderStyle">3</int>
-						<string key="IBUIPlaceholder">secret</string>
 						<object class="NSColor" key="IBUITextColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MAA</bytes>
@@ -104,11 +105,16 @@
 							<bool key="IBUISecureTextEntry">YES</bool>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<int key="type">1</int>
+							<double key="pointSize">12</double>
+						</object>
+						<reference key="IBUIFont" ref="9578050"/>
 					</object>
 					<object class="IBUILabel" id="522019067">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{13, 28}, {101, 21}}</string>
+						<string key="NSFrame">{{13, 28}, {83, 21}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="327454090"/>
@@ -117,12 +123,7 @@
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<string key="IBUIText">Email address:</string>
-						<object class="NSFont" key="IBUIFont" id="638683467">
-							<string key="NSName">HelveticaNeue</string>
-							<double key="NSSize">13</double>
-							<int key="NSfFlags">16</int>
-						</object>
+						<string key="IBUIText">Username:</string>
 						<object class="NSColor" key="IBUITextColor" id="377051206">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MCAwIDAAA</bytes>
@@ -131,11 +132,22 @@
 						<int key="IBUIBaselineAdjustment">1</int>
 						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUITextAlignment">2</int>
+						<object class="IBUIFontDescription" key="IBUIFontDescription" id="893899974">
+							<string key="name">HelveticaNeue</string>
+							<string key="family">Helvetica Neue</string>
+							<int key="traits">0</int>
+							<double key="pointSize">13</double>
+						</object>
+						<object class="NSFont" key="IBUIFont" id="16180291">
+							<string key="NSName">HelveticaNeue-Medium</string>
+							<double key="NSSize">13</double>
+							<int key="NSfFlags">16</int>
+						</object>
 					</object>
 					<object class="IBUILabel" id="1028176743">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{13, 67}, {101, 21}}</string>
+						<string key="NSFrame">{{13, 67}, {83, 21}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<reference key="NSWindow"/>
 						<reference key="NSNextKeyView" ref="965235407"/>
@@ -145,12 +157,13 @@
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<string key="IBUIText">Password:</string>
-						<reference key="IBUIFont" ref="638683467"/>
 						<reference key="IBUITextColor" ref="377051206"/>
 						<nil key="IBUIHighlightedColor"/>
 						<int key="IBUIBaselineAdjustment">1</int>
 						<float key="IBUIMinimumFontSize">10</float>
 						<int key="IBUITextAlignment">2</int>
+						<reference key="IBUIFontDescription" ref="893899974"/>
+						<reference key="IBUIFont" ref="16180291"/>
 					</object>
 					<object class="IBUIButton" id="1065737352">
 						<reference key="NSNextResponder" ref="191373211"/>
@@ -167,11 +180,6 @@
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
-						<object class="NSFont" key="IBUIFont">
-							<string key="NSName">HelveticaNeue-Bold</string>
-							<double key="NSSize">14</double>
-							<int key="NSfFlags">16</int>
-						</object>
 						<bool key="IBUIReversesTitleShadowWhenHighlighted">YES</bool>
 						<bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
 						<string key="IBUINormalTitle">Continue</string>
@@ -184,6 +192,17 @@
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC41AA</bytes>
 						</object>
+						<object class="IBUIFontDescription" key="IBUIFontDescription">
+							<string key="name">HelveticaNeue-Bold</string>
+							<string key="family">Helvetica Neue</string>
+							<int key="traits">2</int>
+							<double key="pointSize">14</double>
+						</object>
+						<object class="NSFont" key="IBUIFont">
+							<string key="NSName">HelveticaNeue-Bold</string>
+							<double key="NSSize">14</double>
+							<int key="NSfFlags">16</int>
+						</object>
 					</object>
 					<object class="IBUIActivityIndicatorView" id="391813410">
 						<reference key="NSNextResponder" ref="191373211"/>
@@ -200,7 +219,7 @@
 				<string key="NSFrame">{{0, 64}, {320, 416}}</string>
 				<reference key="NSSuperview"/>
 				<reference key="NSWindow"/>
-				<reference key="NSNextKeyView"/>
+				<reference key="NSNextKeyView" ref="522019067"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MQA</bytes>
@@ -241,6 +260,22 @@
 					<int key="connectionID">13</int>
 				</object>
 				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">loginButton</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="1065737352"/>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">spinner</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="391813410"/>
+					</object>
+					<int key="connectionID">23</int>
+				</object>
+				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">logIn:</string>
 						<reference key="source" ref="1065737352"/>
@@ -249,29 +284,15 @@
 					</object>
 					<int key="connectionID">14</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">loginButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="1065737352"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">spinner</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="391813410"/>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<object class="IBObjectRecord">
 						<int key="objectID">0</int>
-						<reference key="object" ref="0"/>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
 						<reference key="children" ref="1000"/>
 						<nil key="parent"/>
 					</object>
@@ -337,8 +358,9 @@
 				<object class="NSArray" key="dict.sortedKeys">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>-1.CustomClassName</string>
+					<string>-1.IBPluginDependency</string>
 					<string>-2.CustomClassName</string>
-					<string>1.IBEditorWindowLastContentRect</string>
+					<string>-2.IBPluginDependency</string>
 					<string>1.IBPluginDependency</string>
 					<string>11.IBPluginDependency</string>
 					<string>22.IBPluginDependency</string>
@@ -350,8 +372,9 @@
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>UOSSOCredentialsViewController</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>UIResponder</string>
-					<string>{{556, 412}, {320, 480}}</string>
+					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@@ -460,6 +483,6 @@
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">301</string>
+		<string key="IBCocoaTouchPluginVersion">933</string>
 	</data>
 </archive>