Commit c1894ab2 authored by Troy A. Griffitts's avatar Troy A. Griffitts

Fixed permissions on newer Android devices. Reverted https to http for INTF...

Fixed permissions on newer Android devices. Reverted https to http for INTF calls. Added vertical margin for book/chapter select buttons.
parent d9537aec
...@@ -107,7 +107,7 @@ refreshiosimages: ...@@ -107,7 +107,7 @@ refreshiosimages:
cordova-icon --icon=res/swordlogo-1024.png cordova-icon --icon=res/swordlogo-1024.png
cordova-splash --splash=res/swordlogo-1024.png cordova-splash --splash=res/swordlogo-1024.png
setup: clearplugins refreshplatform addplugins updatelocales setup: clearplugins refreshplatform addplugins refreshlocales
# one last refresh platform to get the plugin patches deployed # one last refresh platform to get the plugin patches deployed
make refreshplatform make refreshplatform
...@@ -117,6 +117,7 @@ setup: clearplugins refreshplatform addplugins updatelocales ...@@ -117,6 +117,7 @@ setup: clearplugins refreshplatform addplugins updatelocales
# #
addplugins: addplugins:
cordova plugin add cordova-plugin-inappbrowser || true cordova plugin add cordova-plugin-inappbrowser || true
cordova plugin add cordova-plugin-android-permissions || true
cordova plugin add cordova-plugin-file || true cordova plugin add cordova-plugin-file || true
cordova plugin add cordova-plugin-globalization || true cordova plugin add cordova-plugin-globalization || true
cordova plugin add cordova-custom-config || true cordova plugin add cordova-custom-config || true
...@@ -137,6 +138,7 @@ addplugins: ...@@ -137,6 +138,7 @@ addplugins:
clearplugins: clearplugins:
cordova plugin remove cordova-plugin-inappbrowser || true cordova plugin remove cordova-plugin-inappbrowser || true
cordova plugin remove cordova-plugin-file || true cordova plugin remove cordova-plugin-file || true
cordova plugin remove cordova-plugin-android-permissions || true
cordova plugin remove cordova-plugin-globalization || true cordova plugin remove cordova-plugin-globalization || true
cordova plugin remove cordova-plugin-whitelist || true cordova plugin remove cordova-plugin-whitelist || true
cordova plugin remove cordova-custom-config || true cordova plugin remove cordova-custom-config || true
...@@ -149,7 +151,7 @@ clearplugins: ...@@ -149,7 +151,7 @@ clearplugins:
cordova plugin remove com-sarriaroman-photoviewer || true cordova plugin remove com-sarriaroman-photoviewer || true
cordova plugin remove cordova-plugin-x-toast || true cordova plugin remove cordova-plugin-x-toast || true
updatelocales: refreshlocales:
rm -rf www/bundledResources/locales.d rm -rf www/bundledResources/locales.d
mkdir -p www/bundledResources/locales.d mkdir -p www/bundledResources/locales.d
cd www/bundledResources/uilocales.d/; for i in $$(ls); do cp -f ../../../../sword/locales.d/$$i ../locales.d/; done || true cd www/bundledResources/uilocales.d/; for i in $$(ls); do cp -f ../../../../sword/locales.d/$$i ../locales.d/; done || true
......
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="org.crosswire.bishop" version="1.3.4" 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.3.5" 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> <name>Bishop</name>
<description> <description>
A Bible Study App from CrossWire A Bible Study App from CrossWire
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
<icon height="40" src="res/swordlogo-40.png" width="40" /> <icon height="40" src="res/swordlogo-40.png" width="40" />
</platform> </platform>
<plugin name="cordova-plugin-file" /> <plugin name="cordova-plugin-file" />
<plugin name="cordova-plugin-android-permissions" />
<plugin name="cordova-plugin-inappbrowser" /> <plugin name="cordova-plugin-inappbrowser" />
<plugin name="cordova-plugin-globalization" /> <plugin name="cordova-plugin-globalization" />
<plugin name="cordova-custom-config" /> <plugin name="cordova-custom-config" />
......
...@@ -432,7 +432,10 @@ table.nobottom td, table.nobottom th { ...@@ -432,7 +432,10 @@ table.nobottom td, table.nobottom th {
border: 1px solid #000; border: 1px solid #000;
color: #EEEEEE; color: #EEEEEE;
text-align: center; text-align: center;
margin:0px; margin-left:0px;
margin-right:0px;
margin-top:1px;
margin-bottom:1px;
} }
.ntBook { .ntBook {
......
This diff is collapsed.
...@@ -363,7 +363,7 @@ console.log('*** wordStudy begin'); ...@@ -363,7 +363,7 @@ console.log('*** wordStudy begin');
detail : 'page', detail : 'page',
limit : limit limit : limit
}; };
var url = 'https://ntvmr.uni-muenster.de/community/vmr/api/metadata/liste/search/'; var url = 'http://ntvmr.uni-muenster.de/community/vmr/api/metadata/liste/search/';
console.log('****** Making request to: ' + url +'; params: '+JSON.stringify(postData)); console.log('****** Making request to: ' + url +'; params: '+JSON.stringify(postData));
SWORD.httpUtils.makeRequest(url, $.param(postData), function(o) { SWORD.httpUtils.makeRequest(url, $.param(postData), function(o) {
console.log('****** Returned from request to: ' + url); console.log('****** Returned from request to: ' + url);
...@@ -403,7 +403,7 @@ console.log('****** iterating pages.'); ...@@ -403,7 +403,7 @@ console.log('****** iterating pages.');
if ($(this).find("transcription").length) { if ($(this).find("transcription").length) {
transURL = $(this).find('transcription').attr("uri"); transURL = $(this).find('transcription').attr("uri");
} }
var mssURL = 'https://ntvmr.uni-muenster.de/manuscript-workspace?docID=' + $(m).attr("docID")+"&pageID="+$(this).attr("pageID"); var mssURL = 'http://ntvmr.uni-muenster.de/manuscript-workspace?docID=' + $(m).attr("docID")+"&pageID="+$(this).attr("pageID");
//t += '<tr><td><a href="'+ mssURL + '" target="NTVMR">' + $(m).attr("gaNum") + '</a></td>'; //t += '<tr><td><a href="'+ mssURL + '" target="NTVMR">' + $(m).attr("gaNum") + '</a></td>';
t += '<tr><td>' + $(m).attr("gaNum").replace(/\([^)]*\)/g, '') + '</td>'; t += '<tr><td>' + $(m).attr("gaNum").replace(/\([^)]*\)/g, '') + '</td>';
t += '<td>' + $(m).find("originYear").text() + '</td>'; t += '<td>' + $(m).find("originYear").text() + '</td>';
...@@ -427,7 +427,7 @@ console.log('****** iterating pages.'); ...@@ -427,7 +427,7 @@ console.log('****** iterating pages.');
}); });
console.log('****** done iterating manuscripts.'); console.log('****** done iterating manuscripts.');
t += '</tbody></table>'; t += '</tbody></table>';
t += '<div class="copyLine"><br/><span data-english="This dataset is by no means exhaustive and is growing rapidly. Check back soon for more results.">This dataset is by no means exhaustive and is growing rapidly. Check back soon for more results.</span><br/><br/><span data-english="Courtesy of">Courtesy of</span> <a href="https://egora.uni-muenster.de/intf/index_en.shtml">Institut für Neutestamentliche Textforschung</a></div>'; t += '<div class="copyLine"><br/><span data-english="This dataset is by no means exhaustive and is growing rapidly. Check back soon for more results.">This dataset is by no means exhaustive and is growing rapidly. Check back soon for more results.</span><br/><br/><span data-english="Courtesy of">Courtesy of</span> <a href="http://egora.uni-muenster.de/intf/index_en.shtml">Institut für Neutestamentliche Textforschung</a></div>';
console.log('****** setting result to UI.'); console.log('****** setting result to UI.');
t += '<br/>'; t += '<br/>';
t += '<br/>'; t += '<br/>';
...@@ -473,7 +473,7 @@ console.log('variantGraph showing...'); ...@@ -473,7 +473,7 @@ console.log('variantGraph showing...');
format : 'graph' format : 'graph'
} }
var url = 'https://ntvmr.uni-muenster.de/community/vmr/api/collate/'; var url = 'http://ntvmr.uni-muenster.de/community/vmr/api/collate/';
console.log('requesting from INTF...'); console.log('requesting from INTF...');
SWORD.httpUtils.makeRequest(url, $.param(postData), function(o) { SWORD.httpUtils.makeRequest(url, $.param(postData), function(o) {
console.log('received response from INTF...'); console.log('received response from INTF...');
...@@ -504,7 +504,7 @@ console.log('variantGraph showing...'); ...@@ -504,7 +504,7 @@ console.log('variantGraph showing...');
regUserID: 'intfadmin', regUserID: 'intfadmin',
format : 'atable' format : 'atable'
} }
var url = 'https://ntvmr.uni-muenster.de/community/vmr/api/collate/'; var url = 'http://ntvmr.uni-muenster.de/community/vmr/api/collate/';
SWORD.httpUtils.makeRequest(url, $.param(postData), function(o) { SWORD.httpUtils.makeRequest(url, $.param(postData), function(o) {
$(target).html(o); $(target).html(o);
}); });
...@@ -514,8 +514,8 @@ console.log('variantGraph showing...'); ...@@ -514,8 +514,8 @@ console.log('variantGraph showing...');
if (!target) target = '#client'; if (!target) target = '#client';
verseStudy.closeMenus(); verseStudy.closeMenus();
var verseKey = app.getCurrentVerseKey(); var verseKey = app.getCurrentVerseKey();
// var url = 'https://apokalypse.isbtf.de/community/vmr/api/variant/apparatus/get/?format=html&indexContent='+verseKey.osisRef; // var url = 'http://apokalypse.isbtf.de/community/vmr/api/variant/apparatus/get/?format=html&indexContent='+verseKey.osisRef;
var url = 'https://ntvmr.uni-muenster.de/community/vmr/api/variant/apparatus/get/?format=html&includeBaseline=ECM&indexContent='+verseKey.osisRef; var url = 'http://ntvmr.uni-muenster.de/community/vmr/api/variant/apparatus/get/?format=html&includeBaseline=ECM&indexContent='+verseKey.osisRef;
$(target).html('<iframe class="client decmcontainer" src="'+url+'"/>'); $(target).html('<iframe class="client decmcontainer" src="'+url+'"/>');
}, },
......
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