Revision 4b4b833e
b/Classes/EditPermissionsViewController.m | ||
---|---|---|
160 | 160 |
[textField setAutocorrectionType:UITextAutocorrectionTypeNo]; |
161 | 161 |
[textField setAutocapitalizationType:UITextAutocapitalizationTypeNone]; |
162 | 162 |
[textField setDelegate:self]; |
163 |
textField.placeholder = @"User"; |
|
163 |
textField.placeholder = @"User or User:Group";
|
|
164 | 164 |
textField.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; |
165 | 165 |
textField.text = self.user; |
166 | 166 |
|
... | ... | |
171 | 171 |
else if (indexPath.section == kPermissions) { |
172 | 172 |
cell.selectionStyle = UITableViewCellSelectionStyleNone; |
173 | 173 |
if (indexPath.row == 0) { |
174 |
cell.textLabel.text = @"Read"; |
|
174 |
cell.textLabel.text = @"Read Only";
|
|
175 | 175 |
if (readPermissionSelected) |
176 | 176 |
cell.accessoryType = UITableViewCellAccessoryCheckmark; |
177 | 177 |
else |
178 | 178 |
cell.accessoryType = UITableViewCellAccessoryNone; |
179 | 179 |
} |
180 | 180 |
else { |
181 |
cell.textLabel.text = @"Write"; |
|
181 |
cell.textLabel.text = @"Read/Write";
|
|
182 | 182 |
if (writePermissionSelected) |
183 | 183 |
cell.accessoryType = UITableViewCellAccessoryCheckmark; |
184 | 184 |
else |
b/Classes/FolderDetailViewController.m | ||
---|---|---|
285 | 285 |
cell.accessoryView = nil; |
286 | 286 |
|
287 | 287 |
if (indexPath.row == [permissions count]) { |
288 |
cell.textLabel.text = @"Add Permissions";
|
|
288 |
cell.textLabel.text = @"Share";
|
|
289 | 289 |
cell.detailTextLabel.text = @""; |
290 | 290 |
} |
291 | 291 |
else { |
... | ... | |
338 | 338 |
if (indexPath.row == [permissions count]) { |
339 | 339 |
user = @""; |
340 | 340 |
vc.removePermissionsEnabled = NO; |
341 |
vc.navigationItem.title = @"Add Permissions";
|
|
341 |
vc.navigationItem.title = @"Share";
|
|
342 | 342 |
} |
343 | 343 |
else { |
344 | 344 |
user = [[permissions allKeys] objectAtIndex:indexPath.row]; |
... | ... | |
354 | 354 |
vc.writePermissionSelected = NO; |
355 | 355 |
|
356 | 356 |
vc.removePermissionsEnabled = YES; |
357 |
vc.navigationItem.title = @"Edit Permissions";
|
|
357 |
vc.navigationItem.title = @"Edit Sharing";
|
|
358 | 358 |
} |
359 | 359 |
|
360 | 360 |
vc.user = user; |
b/Classes/StorageObjectViewController.m | ||
---|---|---|
28 | 28 |
#import "ObjectVersionsViewController.h" |
29 | 29 |
|
30 | 30 |
#define kDetails 0 |
31 |
#define kMetadata 1
|
|
31 |
#define kMetadata 2
|
|
32 | 32 |
|
33 | 33 |
#define maxMetadataViewableLength 12 |
34 | 34 |
|
... | ... | |
157 | 157 |
} |
158 | 158 |
|
159 | 159 |
//[self setBackgroundView]; |
160 |
publicLinkSection = 2; |
|
161 |
permissionsSection = 3; |
|
160 |
actionsSection = 1; |
|
161 |
publicLinkSection = 3; |
|
162 |
permissionsSection = 4; |
|
162 | 163 |
if (self.container.cdnEnabled) { |
163 |
cdnURLSection = 4; |
|
164 |
actionsSection = 5; |
|
164 |
cdnURLSection = 5; |
|
165 | 165 |
deleteSection = 6; |
166 | 166 |
versionsSection = 7; |
167 | 167 |
} else { |
168 | 168 |
cdnURLSection = -1; |
169 |
actionsSection = 4; |
|
170 | 169 |
deleteSection = 5; |
171 | 170 |
versionsSection = 6; |
172 | 171 |
} |
... | ... | |
176 | 175 |
permissionsSection = -1; |
177 | 176 |
versionsSection = -1; |
178 | 177 |
deleteSection = -1; |
179 |
actionsSection = 2; |
|
180 | 178 |
objectIsReadOnly = YES; |
181 | 179 |
} |
182 |
if (account.sharingAccount || account.shared) |
|
183 |
deleteSection = -1; |
|
180 |
if (account.sharingAccount || account.shared) { |
|
181 |
versionsSection = -1; |
|
182 |
deleteSection = -1; |
|
183 |
} |
|
184 | 184 |
|
185 | 185 |
|
186 | 186 |
// let's see if we can tweet |
... | ... | |
262 | 262 |
|
263 | 263 |
- (CGFloat)tableView:(UITableView *)aTableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { |
264 | 264 |
CGFloat result = aTableView.rowHeight; |
265 |
|
|
265 |
|
|
266 | 266 |
if (indexPath.section == cdnURLSection) { |
267 | 267 |
result = 22.0 + [self findLabelHeight:[[NSString stringWithFormat:@"%@/%@", self.container.cdnURL, self.object.fullPath] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding] font:[UIFont systemFontOfSize:18.0]]; |
268 | 268 |
} else if (indexPath.section == kDetails && indexPath.row == 1) { |
... | ... | |
297 | 297 |
|
298 | 298 |
static NSString *CellIdentifier = @"Cell"; |
299 | 299 |
static NSString *TextViewCellIdentifier = @"TextViewCell"; |
300 |
|
|
301 | 300 |
if (indexPath.section == publicLinkSection) { |
302 | 301 |
if (indexPath.row == 1) { |
303 | 302 |
TextViewCell *cell = [aTableView dequeueReusableCellWithIdentifier:TextViewCellIdentifier]; |
... | ... | |
325 | 324 |
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:CellIdentifier] autorelease]; |
326 | 325 |
cell.textLabel.backgroundColor = [UIColor clearColor]; |
327 | 326 |
cell.detailTextLabel.backgroundColor = [UIColor clearColor]; |
328 |
cell.detailTextLabel.numberOfLines = 0; |
|
329 | 327 |
cell.detailTextLabel.lineBreakMode = UILineBreakModeWordWrap; |
330 | 328 |
} |
331 | 329 |
cell.textLabel.textColor = [UIColor blackColor]; |
330 |
cell.detailTextLabel.numberOfLines = 0; |
|
331 |
|
|
332 | 332 |
if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) { |
333 | 333 |
cell.backgroundColor = [UIColor colorWithRed:1 green:1 blue:1 alpha:0.8]; |
334 | 334 |
} |
... | ... | |
408 | 408 |
cell.accessoryView = nil; |
409 | 409 |
|
410 | 410 |
if (indexPath.row == [permissions count]) { |
411 |
cell.textLabel.text = @"Add Permissions";
|
|
411 |
cell.textLabel.text = @"Share";
|
|
412 | 412 |
cell.detailTextLabel.text = @""; |
413 |
} |
|
414 |
else { |
|
413 |
} else { |
|
415 | 414 |
NSString *user = [[permissions allKeys] objectAtIndex:indexPath.row]; |
416 | 415 |
cell.textLabel.text = user; |
417 |
cell.detailTextLabel.text = [permissions objectForKey:user]; |
|
416 |
NSString *accessType; |
|
417 |
if ([[permissions objectForKey:user] isEqualToString:@"write"]) |
|
418 |
accessType = @"Read/Write"; |
|
419 |
else |
|
420 |
accessType = @"Read Only"; |
|
421 |
cell.detailTextLabel.numberOfLines = 1; |
|
422 |
cell.detailTextLabel.lineBreakMode = UILineBreakModeTailTruncation; |
|
423 |
cell.detailTextLabel.text = accessType; |
|
418 | 424 |
} |
419 | 425 |
} else if (indexPath.section == cdnURLSection) { |
420 | 426 |
cell.detailTextLabel.textAlignment = UITextAlignmentLeft; |
... | ... | |
501 | 507 |
if (indexPath.row == [permissions count]) { |
502 | 508 |
user = @""; |
503 | 509 |
vc.removePermissionsEnabled = NO; |
504 |
vc.navigationItem.title = @"Add Permissions";
|
|
510 |
vc.navigationItem.title = @"Share";
|
|
505 | 511 |
} |
506 | 512 |
else { |
507 | 513 |
user = [[permissions allKeys] objectAtIndex:indexPath.row]; |
... | ... | |
517 | 523 |
vc.writePermissionSelected = NO; |
518 | 524 |
|
519 | 525 |
vc.removePermissionsEnabled = YES; |
520 |
vc.navigationItem.title = @"Edit Permissions";
|
|
526 |
vc.navigationItem.title = @"Edit Sharing";
|
|
521 | 527 |
} |
522 | 528 |
|
523 | 529 |
vc.user = user; |
... | ... | |
563 | 569 |
self.documentInteractionController.name = object.name; |
564 | 570 |
|
565 | 571 |
UITableViewCell *openFileCell = [self.tableView cellForRowAtIndexPath:indexPath]; |
566 |
if (![self.documentInteractionController presentOptionsMenuFromRect:openFileCell.frame inView:self.view animated:YES]) { |
|
572 |
CGRect frameToPresentMenuFrom = CGRectMake(openFileCell.frame.origin.x, |
|
573 |
openFileCell.frame.origin.y - self.tableView.contentOffset.y, |
|
574 |
openFileCell.frame.size.width, |
|
575 |
openFileCell.frame.size.height); |
|
576 |
if (![self.documentInteractionController presentOptionsMenuFromRect:frameToPresentMenuFrom inView:self.view animated:YES]) { |
|
567 | 577 |
if ([self.object isPlayableMedia]) { |
568 | 578 |
MediaViewController *vc = [[MediaViewController alloc] initWithNibName:@"MediaViewController" bundle:nil]; |
569 | 579 |
vc.container = self.container; |
b/Classes/UIViewController+Conveniences.m | ||
---|---|---|
76 | 76 |
nav.navigationBar.opaque = self.navigationController.navigationBar.opaque; |
77 | 77 |
nav.navigationBar.barStyle = self.navigationController.navigationBar.barStyle; |
78 | 78 |
} |
79 |
|
|
80 | 79 |
[self.navigationController presentModalViewController:nav animated:animated]; |
81 | 80 |
[nav release]; |
82 | 81 |
} |
b/OpenStack-Info.plist | ||
---|---|---|
43 | 43 |
<key>CFBundlePackageType</key> |
44 | 44 |
<string>APPL</string> |
45 | 45 |
<key>CFBundleShortVersionString</key> |
46 |
<string>1.0.1</string>
|
|
46 |
<string>1.0.2</string>
|
|
47 | 47 |
<key>CFBundleSignature</key> |
48 | 48 |
<string>????</string> |
49 | 49 |
<key>CFBundleURLTypes</key> |
... | ... | |
58 | 58 |
</dict> |
59 | 59 |
</array> |
60 | 60 |
<key>CFBundleVersion</key> |
61 |
<string>20120402.0</string>
|
|
61 |
<string>20120409.0</string>
|
|
62 | 62 |
<key>LSRequiresIPhoneOS</key> |
63 | 63 |
<true/> |
64 | 64 |
<key>NSMainNibFile</key> |
Also available in: Unified diff