Permalink
Browse files

Styling changes for the Disclaimer screen

  • Loading branch information...
1 parent 6b0328a commit e094aed1855782dd0033b29c1aa1fad2ed6898a0 @brendanlim brendanlim committed May 9, 2010
Showing with 23 additions and 12 deletions.
  1. +13 −3 Resources/app.js
  2. +7 −6 Resources/javascripts/disclaimer.js
  3. +2 −2 build/iphone/Classes/ApplicationRouting.m
  4. +1 −1 build/iphone/main.m
View
@@ -56,24 +56,34 @@ tabGroup.addTab(reportTab);
tabGroup.addTab(twitterTab);
tabGroup.addTab(aboutTab);
+
+var disclaimerTabGroup = Titanium.UI.createTabGroup();
var disclaimerWin = Titanium.UI.createWindow({
url:'javascripts/disclaimer.js',
backgroundColor:'#2f5480',
title:'Disclaimer',
barColor:"#333",
- backTitle:'Close'
+ backTitle:'Close',
+ tabBarHidden:true
+});
+var disclaimerTab = Titanium.UI.createTab({
+ title:'Disclaimer',
+ window:disclaimerWin
});
+disclaimerTabGroup.addTab(disclaimerTab);
+
+// Ti.App.Properties.setBool('disclaimerViewed', null);
Ti.App.addEventListener('remove_disclaimer', function() {
- disclaimerWin.close();
+ disclaimerTabGroup.close();
Ti.App.Properties.setBool('disclaimerViewed', true);
tabGroup.open();
});
if (Ti.App.Properties.getBool('disclaimerViewed') != null) {
tabGroup.open();
} else {
- disclaimerWin.open();
+ disclaimerTabGroup.open();
}
@@ -13,17 +13,17 @@ win.add(bgImage);
var scrollView = Ti.UI.createScrollView({
top: 0,
left: 0,
- contentHeight: 900,
+ contentHeight: 'auto',
contentWidth: 320
});
var disclaimerLabel = Ti.UI.createLabel({
- top: 0,
+ top: 10,
left: 10,
width: 300,
- height: 800,
+ height: 'auto',
color: '#fff',
- font:{fontSize:16, fontWeight:'normal'},
+ font:{fontSize:14, fontWeight:'normal'},
text: "1) Do Not Touch anything you observe! Reporting means observing from a safe location. Do not take risk to yourself, others or the wildlife. Reporting is the act of sharing what you see. Please report critical information directly to the authorities. If you find oiled wildlife please call (866) 448-5816. If you find an oiled beach please report it at (866) 448-5816.\n\n" +
"2) Data you submit, including your location will be public data. The information collected here via Oil Reporter will be shared back out to the public via a data feed on www.oilreporter.org. It is critical that you turn your location on (see video). Without it, we can't map where you took your picture. Your data will be housed at San Diego State University.\n\n" +
"3) Personal privacy. Your personal information will not be collected on this application. We encourage thoughtful reporting. Data retrieved on this application will be monitored. As a reminder, your location and the data you submit will be made public.\n\n" +
@@ -35,10 +35,11 @@ scrollView.add(disclaimerLabel);
var tosButton = Ti.UI.createButton({
width: 301,
height: 57,
- top: 800,
+ top: 640,
backgroundImage: '../images/button_dark_off.png',
backgroundSelectedImage: '../images/button_dark_on.png',
- title: 'I accept'
+ font:{fontSize:16, fontWeight:'bold'},
+ title: 'I Accept'
});
tosButton.addEventListener('click', function() {
Ti.App.fireEvent('remove_disclaimer');
Oops, something went wrong.

0 comments on commit e094aed

Please sign in to comment.