Commit 867f7f53 authored by Troy A. Griffitts's avatar Troy A. Griffitts

Added [X] to Gospel Parallels for iOS. Added "Green" to original themes. ...

Added [X] to Gospel Parallels for iOS.  Added "Green" to original themes.  Stopped topbar from toggle when clicking on Gospel Parallel Marker.  Added "Discover" when installation sources haven't been refreshed yet.
parent b75ab083
......@@ -53,8 +53,8 @@ See ## Developing with build.phonegap.com ## later in this README
# the plethora of required images. You'll need to install
# these with something like:
#
# npm -g -i cordova-icon
# npm -g -i cordova-splash
# sudo npm -g i cordova-icon
# sudo npm -g i cordova-splash
#
# but see these links:
# https://github.com/AlexDisler/cordova-icon
......
<?xml version='1.0' encoding='utf-8'?>
<widget id="org.crosswire.bishop" version="1.4.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<widget id="org.crosswire.bishop" version="1.4.3" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<name>Bishop</name>
<description>
A Bible Study App from CrossWire
......
......@@ -382,7 +382,7 @@ table.nobottom td, table.nobottom th {
#keyDisplay {
color: white;
font-size: 175%;
font-size: 165%;
padding-left: .4em;
}
......
var app = {
version: '1.4.2', // change version here and in config.xml, near top
version: '1.4.3', // change version here and in config.xml, near top
backFunction: null,
enableBibleSync : true,
enableGospelParallels : true,
......@@ -286,7 +286,14 @@ console.log('******** trying to prevent body scroll');
$('body').scrollTop(0);
$(document).scrollTop(0);
},
ignoreNextTextDisplayClick : false,
handleTextDisplayClick : function(o) {
// assert we haven't been told to ignore next tap
if (app.ignoreNextTextDisplayClick) { app.ignoreNextTextDisplayClick = false; return; }
console.log('******** trying to scroll body to top');
$('body').scrollTop(0);
$(document).scrollTop(0);
......@@ -626,7 +633,7 @@ console.log('****************** ------------- ***********************');
if (!window.localStorage.getItem('bibleSyncUserName')) window.localStorage.setItem('bibleSyncUserName', 'BishopUser');
if (!window.localStorage.getItem('bibleSyncPassphrase')) window.localStorage.setItem('bibleSyncPassphrase', 'BibleSync');
if (!window.localStorage.getItem('mainViewType')) window.localStorage.setItem('mainViewType', 'Bibles');
if (!window.localStorage.getItem('appTheme')) window.localStorage.setItem('appTheme', 'wash.css');
if (!window.localStorage.getItem('appTheme')) window.localStorage.setItem('appTheme', 'sb-light.css');
if (!window.localStorage.getItem('appLocale') && !app.checkDefaultLocale) {
window.localStorage.setItem('appLocale', app.defaultLocale);
}
......@@ -888,6 +895,9 @@ console.log('setShowGospelParallels: ' + value);
SWORD.mgr.getModuleByName('Eusebian_vs', function(eus) {
if (!eus) {
var t = '<div class="about"><center>';
t += '<br/>';
t += '<br/>';
t += '<br/>';
t += '<p><span data-english="You have asked to show Gospel parallels. For this feature, we need to download a small set of data. Is this OK?">You have asked to show Gospel parallels. For this feature, we need to download a small set of data. Is this OK?</span></p>';
t += '<button onclick="app.popupHide(); app.installModule(\'Eusebian_vs\');return false;" data-english="Install Module">Install Module</button> &nbsp;&nbsp; <button onclick="app.setShowGospelParallels(false); app.popupHide(); return false;" data-english="Cancel">Cancel</button></center>';
t += '</div>';
......@@ -1178,8 +1188,8 @@ console.log('Installed module: ' + app.mods[i].name + '; features.length: ' + ap
$('input[name=viewSelector]').prop('checked', false);
$('input[name=viewSelector][value="'+app.mainViewType+'"]').prop('checked', true);
$('#appTheme').append('<option data-english="Light" value="wash.css">Light</option>');
$('#appTheme').append('<option data-english="Dark" value="dark.css">Dark</option>');
$('#appTheme').append('<option data-english="Green Light" value="wash.css">Green Light</option>');
$('#appTheme').append('<option data-english="Green Dark" value="dark.css">Green Dark</option>');
$('#appTheme').append('<option data-english="Brown Light" value="cap-light.css">Brown Light</option>');
$('#appTheme').append('<option data-english="Brown Dark" value="cap-dark.css">Brown Dark</option>');
$('#appTheme').append('<option data-english="Stone Blue Light" value="sb-light.css">Stone Blue Light</option>');
......@@ -1693,12 +1703,16 @@ console.log('**** looping sources');
});
},
showGospelParallel : function(osisRef) {
console.log('*** Showing Gospel Parallel');
app.ignoreNextTextDisplayClick = true;
eusebian.getEusebianGospelsText(app.getCurrentMod1(), 0, osisRef, function(text) {
var t = '<div id="eusebianGospelDialog" class="center popupDialog">';
t += '<br/>';
t += '<br/>';
t += '<br/>';
t += '<br/>';
t += '<div style="margin-left:0.5em;font-size:250%;"><b>×</b></div>';
t += '<br/>';
t += text;
t += '<br/>';
t += '<br/>';
......@@ -1817,7 +1831,7 @@ console.log('headerLoopContinue. mods.length: ' + mods.length + '; renderData.le
t += '<td';
var eusLabel = renderData[0][v].eusLabel;
if (eusLabel && eusLabel.length > 0) {
t += ' class="eusnum" style="padding:0;margin:0" valign="top" align="center" onclick="app.showGospelParallel(\''+verseKey.osisRef+'\')">' + eusLabel;
t += ' class="eusnum" style="padding:0;margin:0" valign="top" align="center" onclick="app.showGospelParallel(\''+verseKey.osisRef+'\');return false;">' + eusLabel;
}
else t += '>';
t += '</td>';
......
......@@ -165,7 +165,7 @@ var installMgr = {
else {
t += '<p><button data-english="Install" onclick="app.popupHide(); installMgr.installModule(\''+sourceName+'\', \''+modName+'\'); return false;">Install</button>';
}
t += '<button data-english="Cancel" onclick="app.popupHide(); return false;">Cancel</button></p>';
t += '&nbsp;&nbsp;<button data-english="Cancel" onclick="app.popupHide(); return false;">Cancel</button></p>';
remoteMod.getConfigEntry('About', function(about) {
t += '<div>'+(about?about:'')+'</div>';
if (remoteMod.shortPromo && remoteMod.shortPromo.length) t += '<div class="promoLine">' + remoteMod.shortPromo +'</div>';
......@@ -313,17 +313,23 @@ console.log('**** installMgr.installModule. disclaimer accepted. installing modu
var sourceName = $('#modSource').val();
if (sourceName == 'Installed') installMgr.showInstalled();
else if (sourceName == 'Updates Available') installMgr.showUpdatedResources();
else if (sourceName == '-1') installMgr.refreshSources();
else installMgr.showRemoteModules(sourceName);
},
refreshModSourceList: function(callback) {
var t = '<option value="Installed" data-english="Installed">Installed</option>';
t += '<option value="Updates Available" data-english="Updates Available">Updates Available</option>';
SWORD.mgr.translate('Installation Sources', function(translated) {
t += '<optgroup label="'+translated+'">';
SWORD.installMgr.getRemoteSources(function(sources) {
SWORD.installMgr.getRemoteSources(function(sources) {
var isGroupText = 'Installation Sources';
if (!sources.length) isGroupText = 'No Installation Sources Known. Press ↻ to Discover.'
SWORD.mgr.translate(isGroupText, function(translated) {
t += '<optgroup label="'+translated+'">';
for (var i = 0; i < sources.length; ++i) {
t += '<option>'+sources[i]+'</option>';
}
if (!sources.length) {
t += '<option data-english="↻ Discover" value="-1">↻ Discover</option>';
}
t += '</optgroup>';
$('#modSource').html(t);
app.setAppLocale();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment