more changes

USDepartmentofLabor · Sep 20, 2018 · f23f6f0 · f23f6f0
1 parent 0e28598
commit f23f6f0
Show file tree

Hide file tree

Showing 6 changed files with 663 additions and 684 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/39683.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/39683.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Child Labor/Base.lproj/Main.storyboard b/Child Labor/Base.lproj/Main.storyboard
@@ -154,31 +154,10 @@
                                     </tableViewCell>
                                 </cells>
                             </tableViewSection>
-                            <tableViewSection id="MBl-uR-gNP">
-                                <cells>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="Z2e-3K-X3K" style="IBUITableViewCellStyleDefault" id="v2L-Zs-ORx">
-                                        <rect key="frame" x="0.0" y="339" width="320" height="44"/>
-                                        <autoresizingMask key="autoresizingMask"/>
-                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="v2L-Zs-ORx" id="3Ez-Lf-wTC">
-                                            <rect key="frame" x="0.0" y="0.0" width="286" height="43.5"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="An Intro to OCFT" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Z2e-3K-X3K">
-                                                    <rect key="frame" x="16" y="0.0" width="269" height="43.5"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="16"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                                    <nil key="highlightedColor"/>
-                                                </label>
-                                            </subviews>
-                                        </tableViewCellContentView>
-                                    </tableViewCell>
-                                </cells>
-                            </tableViewSection>
                             <tableViewSection id="Dji-MW-50l">
                                 <cells>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" textLabel="gc1-x9-jLs" style="IBUITableViewCellStyleDefault" id="xYl-2I-RJz">
-                                        <rect key="frame" x="0.0" y="403" width="320" height="44"/>
+                                        <rect key="frame" x="0.0" y="339" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xYl-2I-RJz" id="51P-PI-lgW">
                                             <rect key="frame" x="0.0" y="0.0" width="286" height="43.5"/>

diff --git a/Child Labor/MoreInfoController.swift b/Child Labor/MoreInfoController.swift
@@ -39,8 +39,8 @@ class MoreInfoController: UITableViewController {
     // MARK: - Table view data source
 
     override func numberOfSections(in tableView: UITableView) -> Int {
-        return 4
-
+        //return 4
+            return 3
     }
 
     override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -49,8 +49,8 @@ class MoreInfoController: UITableViewController {
             return 2
         case 1:
             return 4
-        case 2:
-            return 1
+//        case 2:
+//            return 1
 
         default:
             return 1
@@ -65,7 +65,7 @@ class MoreInfoController: UITableViewController {
                 UIApplication.shared.openURL(URL(string: "https://www.dol.gov/sites/default/files/documents/ilab/reports/child-labor/findings/TDAMagazine.pdf")!)
                 break
             case 2:
-                UIApplication.shared.openURL(URL(string: "https://www.dol.gov/sites/default/files/documents/ilab/reports/child-labor/findings/TVPRA_Report2016.pdf")!)
+                UIApplication.shared.openURL(URL(string: "https://www.dol.gov/sites/default/files/documents/ilab/listofgoods.pdf")!)
                 break
             case 3:
                 UIApplication.shared.openURL(URL(string: "https://www.dol.gov/sites/default/files/documents/ilab/reports/child-labor/findings/EO_Report_2014.pdf")!)

diff --git a/Child Labor/TDA-foreword-2017.pdf b/Child Labor/TDA-foreword-2017.pdf