From 4d19c16cb820d6a729c454bf89171564466533ef Mon Sep 17 00:00:00 2001
From: Miles Crabbe <mecrabbe@crimson.ua.edu>
Date: Fri, 6 Jun 2014 14:42:34 -0500
Subject: [PATCH] -extremely basic about UP page implemented, NOT FINAL PRODUCT

---
 .../AboutUPViewController.h                   |  4 +-
 .../AboutUPViewController.m                   | 40 +++++++--
 .../AboutUPViewController.xib                 | 89 ++++++++++++-------
 .../ContactUPViewController.xib               |  4 +
 .../DirectoryTableViewCell.xib                |  3 +
 5 files changed, 102 insertions(+), 38 deletions(-)

diff --git a/UniversityPrograms/UniversityPrograms/AboutUPViewController.h b/UniversityPrograms/UniversityPrograms/AboutUPViewController.h
index 720798f..6e52bcb 100644
--- a/UniversityPrograms/UniversityPrograms/AboutUPViewController.h
+++ b/UniversityPrograms/UniversityPrograms/AboutUPViewController.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "UPViewController.h"
 
-@interface AboutUPViewController : UPViewController
-@property (weak, nonatomic) IBOutlet UILabel *placeholderLabel;
+@interface AboutUPViewController : UPViewController <UITableViewDataSource, UITableViewDelegate>
+
 
 @end
diff --git a/UniversityPrograms/UniversityPrograms/AboutUPViewController.m b/UniversityPrograms/UniversityPrograms/AboutUPViewController.m
index c152c66..77f799e 100644
--- a/UniversityPrograms/UniversityPrograms/AboutUPViewController.m
+++ b/UniversityPrograms/UniversityPrograms/AboutUPViewController.m
@@ -10,9 +10,9 @@
 #import "UIColor+UPColors.h"
 @interface AboutUPViewController ()
 
-@property (weak, nonatomic) IBOutlet UIScrollView *mainScrollView;
-@property (strong, nonatomic) IBOutlet UIView *bigView;
-
+@property (weak, nonatomic) IBOutlet UITableView *aboutTableView;
+@property (strong, nonatomic) IBOutlet UITableViewCell *whatWeDo;
+@property (strong, nonatomic) IBOutlet UITableViewCell *whoWeAre;
 
 @end
 
@@ -34,8 +34,7 @@ - (void)viewDidLoad
 {
     [super viewDidLoad];
     
-    self.mainScrollView.contentSize=self.bigView.frame.size;
-    [self.view addSubview:self.bigView];
+    
     
     
     //[self.view addSubview:self.scrollView];
@@ -48,4 +47,35 @@ - (void)didReceiveMemoryWarning
     // Dispose of any resources that can be recreated.
 }
 
+- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
+{
+    
+    // Return the number of sections.
+    return 1;
+}
+
+- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
+{
+    
+    // Return the number of rows in the section.
+    return 2;
+}
+
+
+- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath{
+    if(indexPath.row==0){
+        
+    
+        UITableViewCell *cell = self.whatWeDo;
+        return cell;
+    }
+    else{
+        UITableViewCell *cell = self.whoWeAre;
+        return cell;
+    }
+    
+}
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath{
+    [self.aboutTableView reloadData];
+}
 @end
diff --git a/UniversityPrograms/UniversityPrograms/AboutUPViewController.xib b/UniversityPrograms/UniversityPrograms/AboutUPViewController.xib
index 0249339..a5c8005 100644
--- a/UniversityPrograms/UniversityPrograms/AboutUPViewController.xib
+++ b/UniversityPrograms/UniversityPrograms/AboutUPViewController.xib
@@ -6,9 +6,10 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="AboutUPViewController">
             <connections>
-                <outlet property="bigView" destination="JUD-Zq-EN9" id="zHS-Bw-DGR"/>
-                <outlet property="mainScrollView" destination="vEu-4G-GZm" id="UbW-Rq-dlt"/>
-                <outlet property="view" destination="vEu-4G-GZm" id="2Q8-WX-Fts"/>
+                <outlet property="aboutTableView" destination="G7U-EX-3iU" id="216-7E-sbg"/>
+                <outlet property="view" destination="i5M-Pr-FkT" id="E1Q-Nm-lUR"/>
+                <outlet property="whatWeDo" destination="WVc-nC-nhT" id="5hV-ia-tlR"/>
+                <outlet property="whoWeAre" destination="Fen-JF-gQe" id="dIN-IZ-Sjp"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -16,10 +17,16 @@
             <rect key="frame" x="0.0" y="64" width="320" height="455"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="vEu-4G-GZm">
-                    <rect key="frame" x="0.0" y="-172" width="320" height="800"/>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="220" sectionHeaderHeight="22" sectionFooterHeight="22" id="G7U-EX-3iU">
+                    <rect key="frame" x="0.0" y="0.0" width="320" height="455"/>
                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                </scrollView>
+                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
+                    <connections>
+                        <outlet property="dataSource" destination="-1" id="Ctj-L9-mpu"/>
+                        <outlet property="delegate" destination="-1" id="iCi-XF-OHd"/>
+                    </connections>
+                </tableView>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
             <simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
@@ -27,31 +34,51 @@
             <simulatedTabBarMetrics key="simulatedBottomBarMetrics" barStyle="black" translucent="NO"/>
             <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
         </view>
-        <view contentMode="scaleToFill" id="JUD-Zq-EN9">
-            <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="220" id="WVc-nC-nhT">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="213"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-            <subviews>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="h2z-cU-Xlc">
-                    <rect key="frame" x="97" y="128" width="42" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="n9K-r1-SZN">
-                    <rect key="frame" x="206" y="229" width="42" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <nil key="highlightedColor"/>
-                </label>
-                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="7pg-eb-YLR">
-                    <rect key="frame" x="89" y="431" width="42" height="21"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <nil key="highlightedColor"/>
-                </label>
-            </subviews>
-            <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-            <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
-        </view>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="WVc-nC-nhT" id="hba-JY-alH">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="212"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="What We Do" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eJ2-DQ-bNo">
+                        <rect key="frame" x="20" y="8" width="280" height="21"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="TAz-7M-iew">
+                        <rect key="frame" x="6" y="37" width="309" height="168"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <string key="text">The vision of University Programs is to be the central location for all on-campus programming. We will share our resources with other campus departments, student organizations and community partners to assist them in the planning, promotion and implementation of their events. In addition, we will engage students through programs to play a more active role in their experience and education at the Capstone.</string>
+                        <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+            </tableViewCellContentView>
+        </tableViewCell>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="220" id="Fen-JF-gQe">
+            <rect key="frame" x="0.0" y="0.0" width="320" height="200"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Fen-JF-gQe" id="aC7-Ol-OV4">
+                <rect key="frame" x="0.0" y="0.0" width="320" height="199"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Who We Are" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="f5C-Xj-w2v">
+                        <rect key="frame" x="20" y="11" width="280" height="21"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HaL-4r-vNt">
+                        <rect key="frame" x="8" y="35" width="306" height="164"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <string key="text">University Programs is the student-led, student-driven board, which aims to provide University of Alabama students with a variety of events that enhance the overall student experience. We are committed to supporting the overall academic, research and service mission of The University of Alabama and the Ferguson Center Student Union by providing quality collaborative programming that promotes lifelong learning and allows all students to find a place of involvement and importance.</string>
+                        <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                </subviews>
+            </tableViewCellContentView>
+        </tableViewCell>
     </objects>
 </document>
diff --git a/UniversityPrograms/UniversityPrograms/ContactUPViewController.xib b/UniversityPrograms/UniversityPrograms/ContactUPViewController.xib
index 5fdc5be..5d739f7 100644
--- a/UniversityPrograms/UniversityPrograms/ContactUPViewController.xib
+++ b/UniversityPrograms/UniversityPrograms/ContactUPViewController.xib
@@ -45,6 +45,7 @@
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="700 University Boulevard" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="M28-IN-8mI">
                         <rect key="frame" x="0.0" y="6" width="320" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
                         <nil key="highlightedColor"/>
@@ -52,18 +53,21 @@
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Capstone Medical Building - Room 236" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="KUV-tr-mAE">
                         <rect key="frame" x="0.0" y="35" width="320" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Box 870292" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="BkH-6s-c8q">
                         <rect key="frame" x="0.0" y="64" width="320" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Tuscaloosa, AL 35487" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bWG-6N-gIt">
                         <rect key="frame" x="0.0" y="93" width="320" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <nil key="highlightedColor"/>
                     </label>
diff --git a/UniversityPrograms/UniversityPrograms/DirectoryTableViewCell.xib b/UniversityPrograms/UniversityPrograms/DirectoryTableViewCell.xib
index b716af7..b1433f1 100644
--- a/UniversityPrograms/UniversityPrograms/DirectoryTableViewCell.xib
+++ b/UniversityPrograms/UniversityPrograms/DirectoryTableViewCell.xib
@@ -20,6 +20,7 @@
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ffF-rs-6ll">
                         <rect key="frame" x="105" y="0.0" width="215" height="33"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <nil key="highlightedColor"/>
                     </label>
@@ -32,12 +33,14 @@
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Phone" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="YV3-zs-DR6">
                         <rect key="frame" x="105" y="51" width="215" height="21"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="email" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="i4j-XU-RTK">
                         <rect key="frame" x="9" y="73" width="315" height="38"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <nil key="highlightedColor"/>
                     </label>