Skip to content

Commit

Permalink
Change 'iPhone' to 'iOS' for consistency.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sptramer
sptramer committed Feb 8, 2011
1 parent 229dee9 commit 5cca994
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 39 deletions.
28 changes: 14 additions & 14 deletions Resources/modules/packaging/packaging.html
View file
Expand Up @@ -26,7 +26,7 @@
<!-- TABS -->
<div class="tab_divider"></div>
<div class="tab_spacing"></div>
<div class="help_header tab active packaging" id="tab_iphone_package">iPhone</div>
<div class="help_header tab active packaging" id="tab_iphone_package">iOS</div>
<div class="help_header tab packaging" id="tab_android_package">Android</div>
<div style="clear:both"></div>

Expand All @@ -48,19 +48,19 @@
you must complete the following steps.
We cannot verify all steps, so once you've completed them all,
click "Package". At that point, you will need to take the package
and submit it to Apple via the iPhone Developer website.
and submit it to Apple via the iOS Developer website.
</div>

<!-- SIGNUP FOR DEVELOPER PROGRAM -->
<div class="checkbox mobile_prereq" id="package_iphone_signup">
<span>Sign-up for iPhone Developer Program</span>
<span>Sign-up for iOS Developer Program</span>
<a href="http://developer.apple.com/iphone/program/"
target="ti:systembrowser">Sign Up</a>
</div>

<!-- REGISTER PHONE WITH APPLE -->
<div class="checkbox mobile_prereq register_phone">
<span>Register your iPhone with Apple</span>
<span>Register your iOS device with Apple</span>
<a href="http://developer.apple.com/iphone/manage/devices/index.action"
target="ti:systembrowser">Register</a>
</div>
Expand All @@ -80,7 +80,7 @@

<!-- GET LATEST VERSION OF ITUNES -->
<div class="checkbox mobile_prereq" style="display:none">
<span>Download version 8.2 of iTunes (iPhone SDK 3.0 only)</span>
<span>Download version 8.2 of iTunes (iOS SDK 3.0 only)</span>
<span class="found itunes" style="display:none">
<img src="images/greencheck.png"/>
Detected
Expand Down Expand Up @@ -196,7 +196,7 @@

<!-- PROJECT DOES NOT HAVE IPHONE -->
<div class="project_has_iphone_false help_text" style="display:none">
This project is not configured to run for iPhone.
This project is not configured to run for iOS.
</div>

</div>
Expand Down Expand Up @@ -276,13 +276,13 @@
<!-- TABS -->
<div class="tab_divider"></div>
<div class="tab_spacing"></div>
<div class="help_header tab active device" id="tab_iphone_dev">iPhone</div>
<div class="help_header tab active device" id="tab_iphone_dev">iOS</div>
<div class="help_header tab device" id="tab_android_dev">Android</div>
<div style="clear:both"></div>

<div class="help_text">
If your phone is connected to your computer via USB, you can
install and run your app on your Android and/or your iPhone Device.
install and run your app on your Android and/or your iOS device.
</div>

<!-- TAB CONTENT -->
Expand All @@ -293,22 +293,22 @@
<div class="project_has_iphone_true" style="display:none">
<div class="help_text">
<div style="margin-bottom:20px">
Before installing an app on your iPhone,
Before installing an app on your iOS device,
you must complete the following steps.
We cannot verify all steps, so once you've completed them all,
click "Install".
</div>

<!-- SIGNUP FOR DEVELOPER PROGRAM -->
<div class="checkbox mobile_prereq" id="dev_iphone_signup">
<span>Sign-up for iPhone Developer Program</span>
<span>Sign-up for iOS Developer Program</span>
<a href="http://developer.apple.com/iphone/program/"
target="ti:systembrowser">Sign Up</a>
</div>

<!-- REGISTER PHONE WITH APPLE -->
<div class="checkbox mobile_prereq register_phone">
<span>Register your iPhone with Apple</span>
<span>Register your iOS device with Apple</span>
<a href="http://developer.apple.com/iphone/manage/devices/index.action"
target="ti:systembrowser">Register</a>
</div>
Expand All @@ -327,7 +327,7 @@

<!-- GET LATEST VERSION OF ITUNES -->
<div class="checkbox mobile_prereq" style="display:none">
<span>Download version 8.2 of iTunes (iPhone SDK 3.0 only)</span>
<span>Download version 8.2 of iTunes (iOS SDK 3.0 only)</span>
<span class="found itunes" style="display:none">
<img src="images/greencheck.png"/>
Detected
Expand Down Expand Up @@ -426,7 +426,7 @@

<!-- PROJECT DOES NOT HAVE IPHONE -->
<div class="project_has_iphone_false help_text" style="display:none">
This project is not configured to run for iPhone.
This project is not configured to run for iOS.
</div>

</div>
Expand Down Expand Up @@ -468,7 +468,7 @@

<div class="tab_divider"></div>
<div class="tab_spacing"></div>
<div class="help_header tab active emulator" id="mobile_emulator_iphone">iPhone</div>
<div class="help_header tab active emulator" id="mobile_emulator_iphone">iOS</div>
<div class="help_header tab emulator" id="mobile_emulator_android">Android</div>

<!-- IPHONE EMULATOR -->
Expand Down
36 changes: 18 additions & 18 deletions Resources/modules/packaging/packaging_2.html
View file
Expand Up @@ -202,9 +202,9 @@
<img src="images/iphone_emu.png"/>
</div>
<div class="text">
<span class="title">Run iPhone Emulator</span>
<span class="title">Run iOS Emulator</span>
<div class="desc">
Launch the iPhone emulator and test your app
Launch an iOS emulator and test your app
</div>
</div>
</div>
Expand Down Expand Up @@ -253,13 +253,13 @@
<div class="help_header" style="margin-top:-4px">Resources</div>
<div class="help_text">
We have several resources that will help you to start building, testing
and distributing mobile apps for iPhone and Android.
and distributing mobile apps for iOS and Android.
</div>
<div class="help_header">Sign Up</div>
<div class="help_text">
If you want to either test iPhone apps on your device and/or disitribute
If you want to either test iOS apps on your device and/or disitribute
them via the Apple App Store, you will need to sign-up for
<a href="http://developer.apple.com/iphone/program/" target="ti:systembrowser">Apple's iPhone Developer Program</a>.
<a href="http://developer.apple.com/iphone/program/" target="ti:systembrowser">Apple's iOS Developer Program</a>.
</div>
<div class="help_header">Screencasts</div>
<div class="help_text">
Expand All @@ -283,7 +283,7 @@
to the Apple App Store and to the Android Marketplace.
</div>
<!-- TABS -->
<div class="help_header tab active packaging" id="tab_iphone_package">iPhone</div>
<div class="help_header tab active packaging" id="tab_iphone_package">iOS</div>
<div class="help_header tab packaging" id="tab_android_package">Android</div>
<div style="clear:both;border-top:2px solid #333;
position:relative;top:-5px;height:1px"></div>
Expand All @@ -301,19 +301,19 @@
you must complete the following steps.
We cannot verify all steps, so once you've completed them all,
click "Package". At that point, you will need to take the package
and submit it to Apple via the iPhone Developer website.
and submit it to Apple via the iOS Developer website.
</div>

<!-- SIGNUP FOR DEVELOPER PROGRAM -->
<div class="checkbox mobile_prereq" id="package_iphone_signup">
<span>Sign-up for iPhone Developer Program</span>
<span>Sign-up for iOS Developer Program</span>
<a href="http://developer.apple.com/iphone/program/"
target="ti:systembrowser">Sign Up</a>
</div>

<!-- REGISTER PHONE WITH APPLE -->
<div class="checkbox mobile_prereq register_phone">
<span>Register your iPhone with Apple</span>
<span>Register your iOS device with Apple</span>
<a href="http://developer.apple.com/iphone/manage/devices/index.action"
target="ti:systembrowser">Register</a>
</div>
Expand All @@ -333,7 +333,7 @@

<!-- GET LATEST VERSION OF ITUNES -->
<div class="checkbox mobile_prereq">
<span>Download version 8.2 of iTunes (iPhone SDK 3.0 only)</span>
<span>Download version 8.2 of iTunes (iOS SDK 3.0 only)</span>
<span class="found itunes" style="display:none">
<img src="images/greencheck.png"/>
Detected
Expand Down Expand Up @@ -449,7 +449,7 @@

<!-- PROJECT DOES NOT HAVE IPHONE -->
<div class="project_has_iphone_false help_text" style="display:none">
This project is not configured to run for iPhone.
This project is not configured to run for iOS.
</div>

</div>
Expand Down Expand Up @@ -529,10 +529,10 @@

<div class="help_text">
If your phone is connected to your computer via USB, you can
install and run your app on your Android and/or your iPhone Device.
install and run your app on your Android and/or your iOS device.
</div>
<!-- TABS -->
<div class="help_header tab active device" id="tab_iphone_dev">iPhone</div>
<div class="help_header tab active device" id="tab_iphone_dev">iOS</div>
<div class="help_header tab device" id="tab_android_dev">Android</div>
<div style="clear:both;border-top:2px solid #333;
position:relative;top:-5px;height:1px"></div>
Expand All @@ -545,22 +545,22 @@
<div class="project_has_iphone_true" style="display:none">
<div class="help_text">
<div style="margin-bottom:20px">
Before installing an app on your iPhone,
Before installing an app on your iOS device,
you must complete the following steps.
We cannot verify all steps, so once you've completed them all,
click "Install".
</div>

<!-- SIGNUP FOR DEVELOPER PROGRAM -->
<div class="checkbox mobile_prereq" id="dev_iphone_signup">
<span>Sign-up for iPhone Developer Program</span>
<span>Sign-up for iOS Developer Program</span>
<a href="http://developer.apple.com/iphone/program/"
target="ti:systembrowser">Sign Up</a>
</div>

<!-- REGISTER PHONE WITH APPLE -->
<div class="checkbox mobile_prereq register_phone">
<span>Register your iPhone with Apple</span>
<span>Register your iOS device with Apple</span>
<a href="http://developer.apple.com/iphone/manage/devices/index.action"
target="ti:systembrowser">Register</a>
</div>
Expand All @@ -579,7 +579,7 @@

<!-- GET LATEST VERSION OF ITUNES -->
<div class="checkbox mobile_prereq">
<span>Download version 8.2 of iTunes (iPhone SDK 3.0 only)</span>
<span>Download version 8.2 of iTunes (iOS SDK 3.0 only)</span>
<span class="found itunes" style="display:none">
<img src="images/greencheck.png"/>
Detected
Expand Down Expand Up @@ -678,7 +678,7 @@

<!-- PROJECT DOES NOT HAVE IPHONE -->
<div class="project_has_iphone_false help_text" style="display:none">
This project is not configured to run for iPhone.
This project is not configured to run for iOS.
</div>

</div>
Expand Down
10 changes: 5 additions & 5 deletions Resources/perspectives/projects/js/projects.js
View file
Expand Up @@ -1136,7 +1136,7 @@ Projects.handleNewProjectClick = function()
TiDev.resetConsole();
if (!Projects.hasIPad)
{
alert('The iPad requires version 3.2 of the iPhone SDK. Please install to continue');
alert('The iPad requires version 3.2 of the iOS SDK. Please install to continue');
$('#new_project_type').val('desktop')
}
});
Expand All @@ -1159,7 +1159,7 @@ Projects.handleNewProjectClick = function()
}
else
{
TiDev.setConsoleMessage('Checking for iPhone prerequisites...');
TiDev.setConsoleMessage('Checking for iOS prerequisites...');

// run iphone prereq check
var iPhoneCheck = TiDev.launchPython([Titanium.Filesystem.getFile(iPhonePrereqPath).toString(),'project']);
Expand All @@ -1184,15 +1184,15 @@ Projects.handleNewProjectClick = function()
// no XCode
else if (e == 1)
{
alert('XCode is not installed. It is required for iPhone.');
alert('XCode is not installed. It is required for iOS.');
TiDev.setConsoleMessage('Checking for Android prerequisites...');
checkAndroid();
}
// no 3.0 SDK
// Handled for Universal by iPad iOS version check
else if (e == 2)
{
alert('You must have iPhone SDK installed. We cannot find it.');
alert('You must have iOS SDK installed. We cannot find it.');
TiDev.setConsoleMessage('Checking for Android prerequisites...');
checkAndroid();

Expand Down Expand Up @@ -1304,7 +1304,7 @@ Projects.handleNewProjectClick = function()
{
if (Projects.hasIPhone == false && Projects.hasAndroid == false)
{
alert('Mobile SDKs not installed. Please download and install the iPhone SDK 3.0 and/or the Android SDK.');
alert('Mobile SDKs not installed. Please download and install the iOS SDK 3.0 and/or the Android SDK.');
return;
}
}
Expand Down
4 changes: 2 additions & 2 deletions Resources/perspectives/projects/new_project.html
View file
Expand Up @@ -72,14 +72,14 @@
<img src="images/greencheck.png" id="platform_iphone_checked"
style="position:relative;top:1px;left:5px;"/>
<span style="color:#fff;font-size:12px;margin-left:10px;position:relative;top:1px">
iPhone SDK found
iOS SDK found
</span>
</div>
<div id="iphone_sdk_false" style="display:block">
<img src="images/x_pink.png" id="platform_iphone_unchecked"
style="position:relative;top:1px;left:5px;"/>
<span style="color:#fff;font-size:12px;margin-left:10px;position:relative;top:1px">
iPhone SDK found
iOS SDK found
</span>
</div>
</div>
Expand Down

0 comments on commit 5cca994

Please sign in to comment.