From f1b96c8dad5e457e8f3985b1bee23e3bc56b88b8 Mon Sep 17 00:00:00 2001 From: Rory Drysdale Date: Wed, 25 Jun 2014 14:57:55 -0700 Subject: [PATCH] Fixes #46. Added instructions to the export screen. --- app/controllers/exportModal.js | 9 +++++++++ app/styles/exportModal.tss | 14 ++++++++++++++ app/views/exportModal.xml | 4 +++- 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/app/controllers/exportModal.js b/app/controllers/exportModal.js index d4a7fc0..be6e5e0 100644 --- a/app/controllers/exportModal.js +++ b/app/controllers/exportModal.js @@ -10,6 +10,14 @@ var titleLabel = Titanium.UI.createLabel({ }); $.exportWin.setTitleControl(titleLabel); +// User Instructions +var instructions = + "Please press the Select button above.\n\n" + + "Use the picker below to select the Site Survey you wish to prepare for export and press Done.\n\n" + + "Press the Export button and wait for the confirmation that the Survey is ready for export.\n\n" + + "You can now connect your device to iTunes to retrieve the Survey folder.\n\n"; +$.info.text = instructions; + function backBtnClick(){ Ti.App.fireEvent("app:enableIndexExportButton"); $.modalNav.close(); @@ -74,6 +82,7 @@ try { $.selectLbl.addEventListener('click', surveyBtn); } else { $.selectLbl.text = "Please complete a survey before exporting"; + $.info.text = "Please complete a survey before exporting.\n\n"; } } catch (e) { diff --git a/app/styles/exportModal.tss b/app/styles/exportModal.tss index 118ced8..895f3e8 100644 --- a/app/styles/exportModal.tss +++ b/app/styles/exportModal.tss @@ -39,4 +39,18 @@ height: 'auto', style: Titanium.UI.iPhone.ProgressBarStyle.DEFAULT, font: {fontSize: 20} +}, +"#footerLine": { + height: 1, + top: 165, //479 + left: 5, + right: 5, + borderWidth: 1, + borderColor:'#aaa' +}, +"#info": { + left: 80, + right: 80, + top: 180, + font: {fontSize: 18} } diff --git a/app/views/exportModal.xml b/app/views/exportModal.xml index 7154be4..996df1f 100644 --- a/app/views/exportModal.xml +++ b/app/views/exportModal.xml @@ -12,7 +12,9 @@