Merge branch 'master' of github.com:leomchan/code2014

Author: Leo Chan

CODE2014/CODE2014.xcodeproj/project.pbxproj

@@ -537,7 +537,8 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Leo Chan (GFP2J743S9)";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Courtney Douglas (G53GH7RG36)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Courtney Douglas (G53GH7RG36)";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -555,7 +556,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "4916E40B-90FC-456F-94A2-3D948BE9C4A4";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -577,7 +578,8 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Leo Chan (GFP2J743S9)";
+				CODE_SIGN_IDENTITY = "iPhone Developer: Courtney Douglas (G53GH7RG36)";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Courtney Douglas (G53GH7RG36)";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -588,7 +590,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.0;
-				PROVISIONING_PROFILE = "";
+				PROVISIONING_PROFILE = "4916E40B-90FC-456F-94A2-3D948BE9C4A4";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};

CODE2014/CODE2014/Base.lproj/Main.storyboard

@@ -448,7 +448,11 @@
                     </view>
                     <extendedEdge key="edgesForExtendedLayout"/>
                     <navigationItem key="navigationItem" title="Charity Details" id="c10-Fa-Ahg">
-                        <barButtonItem key="rightBarButtonItem" title="Home" id="Se0-V0-UOU"/>
+                        <barButtonItem key="rightBarButtonItem" image="homeButton" id="Se0-V0-UOU">
+                            <connections>
+                                <action selector="homeButtonTapped:" destination="NOY-Uq-MiF" id="S9f-iL-MG6"/>
+                            </connections>
+                        </barButtonItem>
                     </navigationItem>
                     <connections>
                         <outlet property="pieTableView" destination="LfR-GB-Oci" id="4SS-ai-Bi9"/>
@@ -483,7 +487,9 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                     </view>
                     <extendedEdge key="edgesForExtendedLayout"/>
-                    <navigationItem key="navigationItem" title="Charities" id="Z67-L8-0hM"/>
+                    <navigationItem key="navigationItem" title="Charities" id="Z67-L8-0hM">
+                        <barButtonItem key="backBarButtonItem" title="Back" id="2QE-74-ktq"/>
+                    </navigationItem>
                     <connections>
                         <outlet property="mainTableView" destination="SuY-85-5PO" id="HLx-h4-JtY"/>
                         <segue destination="NOY-Uq-MiF" kind="push" identifier="CODEPushToCharityDetails" id="FGY-i3-Ecl"/>
@@ -518,6 +524,7 @@
     </scenes>
     <resources>
         <image name="TriangleAccent" width="68" height="20"/>
+        <image name="homeButton" width="29" height="29"/>
         <image name="piePlate" width="240" height="240"/>
         <image name="triangle1" width="19" height="22"/>
         <image name="triangle2" width="19" height="22"/>

CODE2014/CODE2014/CODEPieChartInfoViewController.h

@@ -13,4 +13,6 @@
 @property (nonatomic, weak) IBOutlet UITableView *pieTableView;
 @property (nonatomic, strong) PFObject *selectedOrganization;
 
+- (IBAction) homeButtonTapped:(id) sender;
+
 @end

CODE2014/CODE2014/CODEPieChartInfoViewController.m

@@ -375,7 +375,10 @@ - (void) webLinkTapped: (id) sender {
     }
 
     [[UIApplication sharedApplication] openURL:[NSURL URLWithString:d]];
-   }
+}
 
+- (IBAction) homeButtonTapped:(id) sender {
+    [self.navigationController popToRootViewControllerAnimated:YES];
+}
 
 @end

CODE2014/CODE2014/Images.xcassets/homeButton.imageset/Contents.json

@@ -0,0 +1,18 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "home.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "home@2x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}