Merge branch 'release/v2.1' into production

.gitignore

@@ -10,3 +10,4 @@ build
 xcuserdata/
 *.diff
 Other Resources
+.idea/workspace.xml

README.md

@@ -1,2 +1,5 @@
 TDA Enrichment App
 ==================
+
+Thomas Deacon Academy Enrichment app, created by George Garside.
+For more information, see the [TDA Enrichment App](http://georgegarside.com/apps/tda-enrichment/) website.

config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.georgegarside.tda-enrichment" version="2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.georgegarside.tda-enrichment" version="2.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <name>TDA-Enrichment</name>
     <description>
         Always have access to Thomas Deacon Academy's Sports Enrichment with the official TDA Enrichment app.

platforms/ios/TDA-Enrichment.xcodeproj/project.pbxproj

@@ -195,6 +195,11 @@
 			isa = PBXProject;
 			attributes = {
 				LastUpgradeCheck = 0510;
+				TargetAttributes = {
+					1D6058900D05DD3D006BFB54 = {
+						DevelopmentTeam = 5TFUK958NL;
+					};
+				};
 			};
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "TDA-Enrichment" */;
 			compatibilityVersion = "Xcode 3.2";
@@ -294,6 +299,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -328,6 +334,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "TDA-Enrichment/TDA-Enrichment-Prefix.pch";

platforms/ios/TDA-Enrichment.xcodeproj/project.xcworkspace/xcshareddata/TDA-Enrichment.xccheckout

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>00C1D4A9-98DA-4C9A-855D-88722D9580D6</string>
+	<key>IDESourceControlProjectName</key>
+	<string>TDA-Enrichment</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>563714291DAEC42E078A4B5E77991B140A90D26C</key>
+		<string>https://github.com/deacons/TDA-Enrichment.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>platforms/ios/TDA-Enrichment.xcodeproj</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>563714291DAEC42E078A4B5E77991B140A90D26C</key>
+		<string>../../../..</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>https://github.com/deacons/TDA-Enrichment.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>563714291DAEC42E078A4B5E77991B140A90D26C</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>563714291DAEC42E078A4B5E77991B140A90D26C</string>
+			<key>IDESourceControlWCCName</key>
+			<string>TDA-Enrichment</string>
+		</dict>
+	</array>
+</dict>
+</plist>

platforms/ios/TDA-Enrichment/TDA-Enrichment-Info.plist

@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0</string>
+	<string>2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0</string>
+	<string>17</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSMainNibFile</key>

platforms/ios/TDA-Enrichment/config.xml

@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='utf-8'?>
-<widget id="com.georgegarside.tda-enrichment" version="2.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
+<widget id="com.georgegarside.tda-enrichment" version="2.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
     <preference name="AllowInlineMediaPlayback" value="false" />
     <preference name="AutoHideSplashScreen" value="true" />
     <preference name="BackupWebStorage" value="cloud" />

www/hf/5w/1.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-5w-1" class="page">
     <div class="page-content">
       <div class="content-block">
         <p>This is the wheel that those desperate to lose weight fast always drive on first. Even though it's not the answer to helping you obtain that celebrity-perfect look by itself, aerobic exercise is still a valuable wheel.</p>

www/hf/5w/2.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-5w-2" class="page">
     <div class="page-content">
       <div class="content-block">
         <p>Whether you're brand new to this whole exercise experience, or fitness is old hat, you probably still know what resistance training entails, or know it by one of its many other names: strength training, weight training, pumping iron, anaerobic exercise, etc.</p>

www/hf/5w/3.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-5w-3" class="page">
     <div class="page-content">
       <div class="content-block">
         <p>Eating right isn't really all that complicated. It's a choice, and a conscious, daily choice at that. Making the right choice on a regular basis, and sticking with your choice over time, will get you there.</p>

www/hf/5w/4.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-5w-4" class="page">
     <div class="page-content">
       <div class="content-block">
         <p>It sounds like the easiest wheel of the five to drive on, but it's actually the one that most frequently gets either too much or too little use. Give your body too much rest and it'll look like it. Give it too little and you increase your odds of not only injuring yourself, but never seeing the body-shaping results you're shooting for.</p>

www/hf/5w/5.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-5w-5" class="page">
     <div class="page-content">
       <div class="content-block">
         <div class="content-block-inner">

www/hf/aerobic.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-aerobic" class="page">
     <div class="page-content">
       <div class="content-block-title">What is Aerobic Training?</div>
       <div class="content-block">

www/hf/at/testing.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-at-testing" class="page">
     <div class="page-content">
       <div class="content-block-title">Test</div>
       <div class="content-block">

www/hf/at/zones.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-at-zones" class="page">
     <div class="page-content">
       <div class="content-block">
         <div class="content-block-inner">

www/hf/cc/exercises.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-cc-exercises" class="page">
     <div class="page-content">
       <div class="content-block-title">The Next Steps</div>
       <div class="content-block">

www/hf/cc/sdcore.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-cc-sdcore" class="page">
     <div class="page-content">
       <div class="content-block-title">Static Floor Exercises</div>
       <div class="content-block">

www/hf/cc/stability.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-cc-stability" class="page">
     <div class="page-content">
       <div class="content-block">
         <p>The aim of core stability training is to effectively recruit the trunk musculature and then learn to control the position of the lumbar spine during dynamic movements. The information presented on this page is based on an article written by Raphael Brandon that was first published in Peak Performance.</p>

www/hf/corecond.html

@@ -6,7 +6,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-corecond" class="page">
     <div class="page-content">
       <div class="list-block">
         <ul>

www/hf/hoff5w.html

@@ -6,7 +6,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-hoff5w" class="page">
     <div class="page-content">
       <div class="list-block">
         <ul>

www/hf/howdoi.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-howdoi" class="page">
     <div class="page-content">
       <div class="content-block-title">I want to burn calories quickly…</div>
       <div class="content-block">

www/hf/n/classes.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-n-classes" class="page">
     <div class="page-content">
       <div class="content-block-title">Carbohydrates</div>
       <div class="content-block">

www/hf/n/intro.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-n-intro" class="page">
     <div class="page-content">
       <div class="content-block">
         <div class="content-block-inner">

www/hf/n/labels.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-n-labels" class="page">
     <div class="page-content">
       <div class="content-block">
         <div class="content-block-inner">

www/hf/nutrition.html

@@ -6,7 +6,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-nutrition" class="page">
     <div class="page-content">
       <div class="list-block">
         <ul>

www/hf/resistancet.html

@@ -6,7 +6,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-resistancet" class="page">
     <div class="page-content">
       <div class="content-block">
         <div class="content-block-inner">

www/hf/rt/1w.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-1w" class="page">
     <div class="page-content">
       <div class="content-block-title">LEGS</div>
       <div class="content-block">

www/hf/rt/2w.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-2w" class="page">
     <div class="page-content">
       <div class="content-block">
         <ul>

www/hf/rt/3w.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-3w" class="page">
     <div class="page-content">
       <div class="content-block">
         <ul>

www/hf/rt/marms.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-marms" class="page">
     <div class="page-content">
       <div class="content-block-title">Basic arm workout</div>
       <div class="content-block">

www/hf/rt/mback.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-mback" class="page">
     <div class="page-content">
       <div class="content-block-title">Basic back workout</div>
       <div class="content-block">

www/hf/rt/mchest.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-mchest" class="page">
     <div class="page-content">
       <div class="content-block-title">Basic chest workout</div>
       <div class="content-block">

www/hf/rt/mlegs.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-mlegs" class="page">
     <div class="page-content">
       <div class="content-block-title">Basic leg workout</div>
       <div class="content-block">

www/hf/rt/mshoulders.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-mshoulders" class="page">
     <div class="page-content">
       <div class="content-block-title">Basic shoulder workout</div>
       <div class="content-block">

www/hf/rt/y111213.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-y111213" class="page">
     <div class="page-content">
       <div class="content-block-title">Workout 1 (Monday) - Upper body</div>
       <div class="content-block">

www/hf/rt/y78.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-y78" class="page">
     <div class="page-content">
       <div class="content-block">
         <p>Training for years 7 &amp; 8 should be based around aerobic activity, however there are some exercises that can be undertaken using bodyweight as resistance.</p>

www/hf/rt/y910.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-rt-y910" class="page">
     <div class="page-content">
       <div class="content-block">
         <p>Whole Body Workout – Legs, Back, Chest, Shoulders, Triceps, Biceps</p>

www/hf/warmcool.html

@@ -5,7 +5,7 @@
   </div>
 </div>
 <div class="pages">
-  <div data-page="hf" class="page">
+  <div data-page="hf-warmcool" class="page">
     <div class="page-content">
       <div class="list-block">
         <ul>