Changeset 15167

Timestamp:

05/30/13 10:43:18 (12 years ago)

Author:

cnpetrie

Message:

Working main menu and about page in simulator

Location:

issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APP

Files:

• AboutViewController.h (modified) (1 diff)
• AboutViewController.m (modified) (2 diffs)
• en.lproj/MainStoryboard_iPhone.storyboard (modified) (7 diffs)

issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APP/AboutViewController.h

@@ -11 +11 @@
 @interface AboutViewController : UIViewController
 
+@property (nonatomic, strong) IBOutlet UIWebView *aboutWebView;
+
 @end

issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APP/AboutViewController.m

@@ -15 +15 @@
 @implementation AboutViewController
 
+@synthesize aboutWebView;
+
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 {
@@ -28 +30 @@
     [super viewDidLoad];
         // Do any additional setup after loading the view.
+    
+    NSURL *url = [NSURL fileURLWithPath:[[NSBundle mainBundle]pathForResource:@"about.html" ofType:nil]];
+    NSURLRequest *request = [NSURLRequest requestWithURL:url];
+    [aboutWebView loadRequest:request];
 }
 

issm/trunk-jpl/src/mobile/ios/ISSM_APP/ISSM_APP/ISSM_APP/en.lproj/MainStoryboard_iPhone.storyboard

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12C3103" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="B9U-Ea-pDf">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="2.0" toolsVersion="3084" systemVersion="12C3103" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="vU4-gH-R9L">
     <dependencies>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="2083"/>
     </dependencies>
     <scenes>
-        <!--Navigation Controller-->
-        <scene sceneID="S5g-IX-qD1">
-            <objects>
-                <navigationController definesPresentationContext="YES" id="B9U-Ea-pDf" sceneMemberID="viewController">
-                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="zsm-he-79o">
-                        <autoresizingMask key="autoresizingMask"/>
-                    </navigationBar>
-                    <connections>
-                        <segue destination="2" kind="relationship" relationship="rootViewController" id="zFW-Lu-Tvw"/>
-                    </connections>
-                </navigationController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="afP-U6-btS" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-2835" y="-369"/>
-        </scene>
         <!--View Controller-->
         <scene sceneID="wVJ-iN-bLu">
@@ -32 +17 @@
                 <placeholder placeholderIdentifier="IBFirstResponder" id="hyd-cS-M4l" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="58" y="-361"/>
+            <point key="canvasLocation" x="1636" y="-361"/>
         </scene>
         <!--Menu Page View Controller-->
@@ -164 +149 @@
                 <placeholder placeholderIdentifier="IBFirstResponder" id="4" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-1938" y="-361"/>
+            <point key="canvasLocation" x="-360" y="-361"/>
         </scene>
         <!--Gallery View Controller-->
@@ -188 +173 @@
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mxq-WV-cef" customClass="AboutView">
+                            <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ofm-HS-T7v">
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             </webView>
@@ -194 +179 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
                         <constraints>
-                            <constraint firstItem="Mxq-WV-cef" firstAttribute="leading" secondItem="EsP-zn-j5d" secondAttribute="leading" type="default" id="9u3-An-eX7"/>
-                            <constraint firstItem="Mxq-WV-cef" firstAttribute="bottom" secondItem="EsP-zn-j5d" secondAttribute="bottom" type="default" id="NKt-x5-Gt6"/>
-                            <constraint firstItem="Mxq-WV-cef" firstAttribute="trailing" secondItem="EsP-zn-j5d" secondAttribute="trailing" type="default" id="VXD-yT-es9"/>
-                            <constraint firstItem="Mxq-WV-cef" firstAttribute="top" secondItem="EsP-zn-j5d" secondAttribute="top" type="default" id="q9I-hy-pl0"/>
+                            <constraint firstItem="Ofm-HS-T7v" firstAttribute="top" secondItem="EsP-zn-j5d" secondAttribute="top" type="default" id="Nfh-aW-RNv"/>
+                            <constraint firstItem="Ofm-HS-T7v" firstAttribute="bottom" secondItem="EsP-zn-j5d" secondAttribute="bottom" type="default" id="Onp-SE-ong"/>
+                            <constraint firstItem="Ofm-HS-T7v" firstAttribute="leading" secondItem="EsP-zn-j5d" secondAttribute="leading" type="default" id="gt0-Vp-Zqt"/>
+                            <constraint firstItem="Ofm-HS-T7v" firstAttribute="trailing" secondItem="EsP-zn-j5d" secondAttribute="trailing" type="default" id="nZ0-hb-Ws1"/>
                         </constraints>
                     </view>
+                    <connections>
+                        <outlet property="aboutWebView" destination="Ofm-HS-T7v" id="hBy-fP-rdj"/>
+                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="9Pp-Ss-Ooq" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -243 +231 @@
             </objects>
             <point key="canvasLocation" x="-1402" y="1091"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="53o-Lu-2c5">
+            <objects>
+                <navigationController id="vU4-gH-R9L" sceneMemberID="viewController">
+                    <toolbarItems/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" id="e7D-nq-n5S">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <nil name="viewControllers"/>
+                    <connections>
+                        <segue destination="2" kind="relationship" relationship="rootViewController" id="Ex0-8c-FpS"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="GDK-uM-ROa" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-886" y="-361"/>
         </scene>
     </scenes>
@@ -253 +259 @@
         <class className="AboutViewController" superclassName="UIViewController">
             <source key="sourceIdentifier" type="project" relativePath="./Classes/AboutViewController.h"/>
+            <relationships>
+                <relationship kind="outlet" name="aboutWebView" candidateClass="UIWebView"/>
+            </relationships>
         </class>
         <class className="GalleryViewController" superclassName="UIViewController">