6 _notes/dwsync.xml
View file
@@ -1,5 +1 @@
<<<<<<< HEAD
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="index.html" server="s99712.gridserver.com/html/mobile/" local="3541609857" remote="323953104457842044" Dst="-1" /><file name="externalConn.js" server="s99712.gridserver.com/html/mobile/" local="3541553100" remote="323953104457813964" Dst="-1" /><file name="localConn.js" server="s99712.gridserver.com/html/mobile/" local="3541424339" remote="318763443934099092" Dst="-1" /><file name="hdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541060020" remote="323953104457320884" Dst="-1" /><file name="head.png" server="s99712.gridserver.com/html/mobile/" local="3541060020" remote="323953104457320884" Dst="-1" /><file name="mobileConn.js" server="s99712.gridserver.com/html/mobile/" local="3537408540" remote="323953104453669404" Dst="-1" /><file name="splash.png" server="s99712.gridserver.com/html/mobile/" local="3541060260" remote="323953104457321124" Dst="-1" /><file name="config.xml" server="s99712.gridserver.com/html/mobile/" local="3541567740" remote="323953104457828604" Dst="-1" /><file name="externalConn.old.js" server="s99712.gridserver.com/html/mobile/" local="3541395540" remote="323953104457656404" Dst="-1" /><file name="newindex.html" server="s99712.gridserver.com/html/mobile/" local="3541548660" remote="323953104457809524" Dst="-1" /><file name="skeleton.html" server="s99712.gridserver.com/html/mobile/" local="3541548660" remote="323953104457809524" Dst="-1" /><file name="staticConn.js" server="s99712.gridserver.com/html/mobile/" local="3541548660" remote="323953104457809524" Dst="-1" /><file name="previous.js" server="s99712.gridserver.com/html/mobile/" local="3541609716" remote="323953104457842044" Dst="-1" /><file name="abta.gif" server="s99712.gridserver.com/html/mobile/" local="3541610221" remote="323953104457320824" Dst="-1" /><file name="check_internet_connection.js" server="s99712.gridserver.com/html/mobile/" local="3541610221" remote="323953104457320824" Dst="-1" /><file name="delegates.js" server="s99712.gridserver.com/html/mobile/" local="3541610226" remote="323953104457320824" Dst="-1" /><file name="fr-xxhdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610228" remote="323953104457320824" Dst="-1" /><file name="delegates.xml" server="s99712.gridserver.com/html/mobile/" local="3541610228" remote="323953104457320824" Dst="-1" /><file name="icon-40.png" server="s99712.gridserver.com/html/mobile/" local="3541610228" remote="323953104457320884" Dst="-1" /><file name="icon-40@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610229" remote="323953104457320884" Dst="-1" /><file name="icon-48.png" server="s99712.gridserver.com/html/mobile/" local="3541610229" remote="323953104457320884" Dst="-1" /><file name="icon-50.png" server="s99712.gridserver.com/html/mobile/" local="3541610229" remote="323953104457320884" Dst="-1" /><file name="icon-50@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610230" remote="323953104457320884" Dst="-1" /><file name="icon-57.png" server="s99712.gridserver.com/html/mobile/" local="3541610230" remote="323953104457320884" Dst="-1" /><file name="icon-60.png" server="s99712.gridserver.com/html/mobile/" local="3541610230" remote="323953104457320884" Dst="-1" /><file name="icon-60@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610231" remote="323953104457320884" Dst="-1" /><file name="icon-60@3x.png" server="s99712.gridserver.com/html/mobile/" local="3541610231" remote="323953104457320884" Dst="-1" /><file name="icon-72.png" server="s99712.gridserver.com/html/mobile/" local="3541610231" remote="323953104457320884" Dst="-1" /><file name="icon-72@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610232" remote="323953104457320884" Dst="-1" /><file name="icon-76.png" server="s99712.gridserver.com/html/mobile/" local="3541610232" remote="323953104457320884" Dst="-1" /><file name="icon-76@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610233" remote="323953104457320884" Dst="-1" /><file name="icon-small.png" server="s99712.gridserver.com/html/mobile/" local="3541610233" remote="323953104457320884" Dst="-1" /><file name="icon-small@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610233" remote="323953104457320884" Dst="-1" /><file name="icon.png" server="s99712.gridserver.com/html/mobile/" local="3541610234" remote="323953104457320884" Dst="-1" /><file name="icon@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610234" remote="323953104457320884" Dst="-1" /><file name="ldpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610390" remote="323953104457321064" Dst="-1" /><file name="mdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610391" remote="323953104457321064" Dst="-1" /><file name="test.html" server="s99712.gridserver.com/html/mobile/" local="3541610417" remote="323953104457321124" Dst="-1" /><file name="tileicon.png" server="s99712.gridserver.com/html/mobile/" local="3541610418" remote="323953104457321124" Dst="-1" /><file name="xhdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610418" remote="323953104457321124" Dst="-1" /><file name="xxhdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610421" remote="323953104457321124" Dst="-1" /><file name="xxxhdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610422" remote="323953104457321124" Dst="-1" /></dwsync>
=======
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name=".DS_Store" server="s99712.gridserver.com//html/" local="3538126646" remote="319783739181963988" Dst="-1" /><file name="abta.gif" server="s99712.gridserver.com//html/" local="3537951633" remote="319783739181273388" Dst="-1" /><file name="check_internet_connection.js" server="s99712.gridserver.com//html/" local="3537951633" remote="319783739181273388" Dst="-1" /><file name="config.xml" server="s99712.gridserver.com//html/" local="3537952466" remote="319783739181963988" Dst="-1" /><file name="delegates.js" server="s99712.gridserver.com//html/" local="3537951634" remote="319783739181273388" Dst="-1" /><file name="externalConn.js" server="s99712.gridserver.com//html/" local="3540821268" remote="319783739184829288" Dst="-1" /><file name="delegates.xml" server="s99712.gridserver.com//html/" local="3537951636" remote="319783739181273388" Dst="-1" /><file name="fr-xxhdpi.png" server="s99712.gridserver.com//html/" local="3537951636" remote="319783739181273388" Dst="-1" /><file name="head.png" server="s99712.gridserver.com//html/" local="3537951637" remote="319783739181273388" Dst="-1" /><file name="hdpi.png" server="s99712.gridserver.com//html/" local="3537951637" remote="319783739181273388" Dst="-1" /><file name="icon-40.png" server="s99712.gridserver.com//html/" local="3537951637" remote="319783739181273388" Dst="-1" /><file name="icon-48.png" server="s99712.gridserver.com//html/" local="3537951638" remote="319783739181273388" Dst="-1" /><file name="icon-40@2x.png" server="s99712.gridserver.com//html/" local="3537951638" remote="319783739181273388" Dst="-1" /><file name="icon-50.png" server="s99712.gridserver.com//html/" local="3537951638" remote="319783739181273388" Dst="-1" /><file name="icon-57.png" server="s99712.gridserver.com//html/" local="3537951639" remote="319783739181273388" Dst="-1" /><file name="icon-50@2x.png" server="s99712.gridserver.com//html/" local="3537951639" remote="319783739181273388" Dst="-1" /><file name="icon-60.png" server="s99712.gridserver.com//html/" local="3537951639" remote="319783739181273388" Dst="-1" /><file name="icon-60@3x.png" server="s99712.gridserver.com//html/" local="3537951640" remote="319783739181273388" Dst="-1" /><file name="icon-60@2x.png" server="s99712.gridserver.com//html/" local="3537951640" remote="319783739181273388" Dst="-1" /><file name="icon-72.png" server="s99712.gridserver.com//html/" local="3537951640" remote="319783739181273388" Dst="-1" /><file name="icon-76.png" server="s99712.gridserver.com//html/" local="3537951641" remote="319783739181273388" Dst="-1" /><file name="icon-72@2x.png" server="s99712.gridserver.com//html/" local="3537951641" remote="319783739181273388" Dst="-1" /><file name="icon-76@2x.png" server="s99712.gridserver.com//html/" local="3537951641" remote="319783739181273388" Dst="-1" /><file name="icon-small@2x.png" server="s99712.gridserver.com//html/" local="3537951642" remote="319783739181273388" Dst="-1" /><file name="icon-small.png" server="s99712.gridserver.com//html/" local="3537951642" remote="319783739181273388" Dst="-1" /><file name="icon.png" server="s99712.gridserver.com//html/" local="3537951642" remote="319783739181273388" Dst="-1" /><file name="icon@2x.png" server="s99712.gridserver.com//html/" local="3537951643" remote="319783739181273388" Dst="-1" /><file name="index.html" server="s99712.gridserver.com//html/" local="3541583626" remote="319783739185419928" Dst="-1" /><file name="localConn.js" server="s99712.gridserver.com//html/" local="3537951806" remote="319783739181273568" Dst="-1" /><file name="ldpi.png" server="s99712.gridserver.com//html/" local="3537951806" remote="319783739181273568" Dst="-1" /><file name="mdpi.png" server="s99712.gridserver.com//html/" local="3537951806" remote="319783739181273628" Dst="-1" /><file name="newindex.html" server="s99712.gridserver.com//html/" local="3537951807" remote="319783739181273628" Dst="-1" /><file name="previous.js" server="s99712.gridserver.com//html/" local="3537951807" remote="319783739181273628" Dst="-1" /><file name="splash.png" server="s99712.gridserver.com//html/" local="3537951830" remote="319783739181273628" Dst="-1" /><file name="xhdpi.png" server="s99712.gridserver.com//html/" local="3537951833" remote="319783739181273628" Dst="-1" /><file name="tileicon.png" server="s99712.gridserver.com//html/" local="3537951833" remote="319783739181273628" Dst="-1" /><file name="xxhdpi.png" server="s99712.gridserver.com//html/" local="3537951833" remote="319783739181273628" Dst="-1" /><file name="xxxhdpi.png" server="s99712.gridserver.com//html/" local="3537951833" remote="319783739181273628" Dst="-1" /><file name="index.html" server="s99712.gridserver.com//html/mobile/" local="3541597716" remote="319783739185433968" Dst="-1" /><file name="externalConn.js" server="s99712.gridserver.com//html/mobile/" local="3541581947" remote="319783739185418188" Dst="-1" /><file name="abta.gif" server="s99712.gridserver.com//html/mobile/" local="3537951633" remote="319783739184925048" Dst="-1" /><file name="check_internet_connection.js" server="s99712.gridserver.com//html/mobile/" local="3537951633" remote="319783739184925048" Dst="-1" /><file name="config.xml" server="s99712.gridserver.com//html/mobile/" local="3541596505" remote="319783739185432828" Dst="-1" /><file name="delegates.js" server="s99712.gridserver.com//html/mobile/" local="3537951634" remote="319783739184925048" Dst="-1" /><file name="delegates.xml" server="s99712.gridserver.com//html/mobile/" local="3537951636" remote="319783739184925048" Dst="-1" /><file name="fr-xxhdpi.png" server="s99712.gridserver.com//html/mobile/" local="3540922235" remote="319783739184925048" Dst="-1" /><file name="hdpi.png" server="s99712.gridserver.com//html/mobile/" local="3540922282" remote="319783739184925108" Dst="-1" /><file name="head.png" server="s99712.gridserver.com//html/mobile/" local="3537951637" remote="319783739184925108" Dst="-1" /><file name="icon-40.png" server="s99712.gridserver.com//html/mobile/" local="3540922539" remote="319783739184925108" Dst="-1" /><file name="icon-40@2x.png" server="s99712.gridserver.com//html/mobile/" local="3540922499" remote="319783739184925108" Dst="-1" /><file name="icon-48.png" server="s99712.gridserver.com//html/mobile/" local="3540922476" remote="319783739184925108" Dst="-1" /><file name="icon-50.png" server="s99712.gridserver.com//html/mobile/" local="3540922456" remote="319783739184925108" Dst="-1" /><file name="icon-50@2x.png" server="s99712.gridserver.com//html/mobile/" local="3540922427" remote="319783739184925108" Dst="-1" /><file name="icon-57.png" server="s99712.gridserver.com//html/mobile/" local="3540922401" remote="319783739184925108" Dst="-1" /><file name="icon-60.png" server="s99712.gridserver.com//html/mobile/" local="3540922378" remote="319783739184925108" Dst="-1" /><file name="icon-60@2x.png" server="s99712.gridserver.com//html/mobile/" local="3540922353" remote="319783739184925108" Dst="-1" /><file name="icon-60@3x.png" server="s99712.gridserver.com//html/mobile/" local="3540922329" remote="319783739184925108" Dst="-1" /><file name="icon-72.png" server="s99712.gridserver.com//html/mobile/" local="3540922296" remote="319783739184925108" Dst="-1" /><file name="icon-72@2x.png" server="s99712.gridserver.com//html/mobile/" local="3540922218" remote="319783739184925108" Dst="-1" /><file name="icon-76.png" server="s99712.gridserver.com//html/mobile/" local="3540922195" remote="319783739184925108" Dst="-1" /><file name="icon-76@2x.png" server="s99712.gridserver.com//html/mobile/" local="3540922165" remote="319783739184925108" Dst="-1" /><file name="icon-small.png" server="s99712.gridserver.com//html/mobile/" local="3540922135" remote="319783739184925108" Dst="-1" /><file name="icon-small@2x.png" server="s99712.gridserver.com//html/mobile/" local="3540922667" remote="319783739184925108" Dst="-1" /><file name="icon.png" server="s99712.gridserver.com//html/mobile/" local="3540922076" remote="319783739184925108" Dst="-1" /><file name="icon@2x.png" server="s99712.gridserver.com//html/mobile/" local="3540922045" remote="319783739184925108" Dst="-1" /><file name="ldpi.png" server="s99712.gridserver.com//html/mobile/" local="3540922005" remote="319783739184925288" Dst="-1" /><file name="localConn.js" server="s99712.gridserver.com//html/mobile/" local="3541575685" remote="319783739185413748" Dst="-1" /><file name="mdpi.png" server="s99712.gridserver.com//html/mobile/" local="3540921974" remote="319783739184925288" Dst="-1" /><file name="previous.js" server="s99712.gridserver.com//html/mobile/" local="3537951807" remote="319783739184925288" Dst="-1" /><file name="splash.png" server="s99712.gridserver.com//html/mobile/" local="3540924103" remote="319783739184925348" Dst="-1" /><file name="test.html" server="s99712.gridserver.com//html/mobile/" local="3540980920" remote="319783739184925348" Dst="-1" /><file name="tileicon.png" server="s99712.gridserver.com//html/mobile/" local="3540921943" remote="319783739184925348" Dst="-1" /><file name="xhdpi.png" server="s99712.gridserver.com//html/mobile/" local="3540921913" remote="319783739184925348" Dst="-1" /><file name="xxhdpi.png" server="s99712.gridserver.com//html/mobile/" local="3540922254" remote="319783739184925348" Dst="-1" /><file name="xxxhdpi.png" server="s99712.gridserver.com//html/mobile/" local="3540921872" remote="319783739184925348" Dst="-1" /><file name="mobileConn.js" server="s99712.gridserver.com//html/mobile/" local="3537408540" remote="319783739181273628" Dst="-1" /><file name="staticConn.js" server="s99712.gridserver.com//html/mobile/" local="3541575758" remote="319783739185413748" Dst="-1" /><file name="externalConn.old.js" server="s99712.gridserver.com//html/mobile/" local="3541395540" remote="319783739185260628" Dst="-1" /><file name="newindex.html" server="s99712.gridserver.com//html/mobile/" local="3537951807" remote="319783739185413748" Dst="-1" /><file name="skeleton.html" server="s99712.gridserver.com//html/mobile/" local="3541514937" remote="319783739185413748" Dst="-1" /></dwsync>
>>>>>>> origin/master
<?xml version="1.0" encoding="utf-8" ?><dwsync><file name="index.html" server="s99712.gridserver.com/html/mobile/" local="3541609857" remote="323953104457842044" Dst="-1" /><file name="externalConn.js" server="s99712.gridserver.com/html/mobile/" local="3541553100" remote="323953104457813964" Dst="-1" /><file name="localConn.js" server="s99712.gridserver.com/html/mobile/" local="3541424339" remote="318763443934099092" Dst="-1" /><file name="hdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541060020" remote="323953104457320884" Dst="-1" /><file name="head.png" server="s99712.gridserver.com/html/mobile/" local="3541060020" remote="323953104457320884" Dst="-1" /><file name="mobileConn.js" server="s99712.gridserver.com/html/mobile/" local="3537408540" remote="323953104453669404" Dst="-1" /><file name="splash.png" server="s99712.gridserver.com/html/mobile/" local="3541060260" remote="323953104457321124" Dst="-1" /><file name="config.xml" server="s99712.gridserver.com/html/mobile/" local="3541567740" remote="323953104457828604" Dst="-1" /><file name="externalConn.old.js" server="s99712.gridserver.com/html/mobile/" local="3541395540" remote="323953104457656404" Dst="-1" /><file name="newindex.html" server="s99712.gridserver.com/html/mobile/" local="3541548660" remote="323953104457809524" Dst="-1" /><file name="skeleton.html" server="s99712.gridserver.com/html/mobile/" local="3541548660" remote="323953104457809524" Dst="-1" /><file name="staticConn.js" server="s99712.gridserver.com/html/mobile/" local="3541548660" remote="323953104457809524" Dst="-1" /><file name="abta.gif" server="s99712.gridserver.com/html/mobile/" local="3541610221" remote="323953104457320824" Dst="-1" /><file name="check_internet_connection.js" server="s99712.gridserver.com/html/mobile/" local="3541610221" remote="323953104457320824" Dst="-1" /><file name="delegates.js" server="s99712.gridserver.com/html/mobile/" local="3541610226" remote="323953104457320824" Dst="-1" /><file name="fr-xxhdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610228" remote="323953104457320824" Dst="-1" /><file name="delegates.xml" server="s99712.gridserver.com/html/mobile/" local="3541610228" remote="323953104457320824" Dst="-1" /><file name="icon-40.png" server="s99712.gridserver.com/html/mobile/" local="3541610228" remote="323953104457320884" Dst="-1" /><file name="icon-40@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610229" remote="323953104457320884" Dst="-1" /><file name="icon-48.png" server="s99712.gridserver.com/html/mobile/" local="3541610229" remote="323953104457320884" Dst="-1" /><file name="icon-50.png" server="s99712.gridserver.com/html/mobile/" local="3541610229" remote="323953104457320884" Dst="-1" /><file name="icon-50@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610230" remote="323953104457320884" Dst="-1" /><file name="icon-57.png" server="s99712.gridserver.com/html/mobile/" local="3541610230" remote="323953104457320884" Dst="-1" /><file name="icon-60.png" server="s99712.gridserver.com/html/mobile/" local="3541610230" remote="323953104457320884" Dst="-1" /><file name="icon-60@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610231" remote="323953104457320884" Dst="-1" /><file name="icon-60@3x.png" server="s99712.gridserver.com/html/mobile/" local="3541610231" remote="323953104457320884" Dst="-1" /><file name="icon-72.png" server="s99712.gridserver.com/html/mobile/" local="3541610231" remote="323953104457320884" Dst="-1" /><file name="icon-72@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610232" remote="323953104457320884" Dst="-1" /><file name="icon-76.png" server="s99712.gridserver.com/html/mobile/" local="3541610232" remote="323953104457320884" Dst="-1" /><file name="icon-76@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610233" remote="323953104457320884" Dst="-1" /><file name="icon-small.png" server="s99712.gridserver.com/html/mobile/" local="3541610233" remote="323953104457320884" Dst="-1" /><file name="icon-small@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610233" remote="323953104457320884" Dst="-1" /><file name="icon.png" server="s99712.gridserver.com/html/mobile/" local="3541610234" remote="323953104457320884" Dst="-1" /><file name="icon@2x.png" server="s99712.gridserver.com/html/mobile/" local="3541610234" remote="323953104457320884" Dst="-1" /><file name="ldpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610390" remote="323953104457321064" Dst="-1" /><file name="mdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610391" remote="323953104457321064" Dst="-1" /><file name="test.html" server="s99712.gridserver.com/html/mobile/" local="3541610417" remote="323953104457321124" Dst="-1" /><file name="tileicon.png" server="s99712.gridserver.com/html/mobile/" local="3541610418" remote="323953104457321124" Dst="-1" /><file name="xhdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610418" remote="323953104457321124" Dst="-1" /><file name="xxhdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610421" remote="323953104457321124" Dst="-1" /><file name="xxxhdpi.png" server="s99712.gridserver.com/html/mobile/" local="3541610422" remote="323953104457321124" Dst="-1" /></dwsync>
14 index.html
View file
@@ -25,17 +25,10 @@
<script src="SpryAssets/SpryData.js" type="text/javascript"></script>
<script type="text/javascript" charset="utf-8" src="cordova.js"></script>

<<<<<<< HEAD
<script type="text/javascript" src="previous.js"></script>
<script type="text/javascript" src="internet_connection.js"></script>

<!--<script type="text/javascript" src="staticConn.js"></script>-->

<!--<script type="text/javascript" src="externalConn.js"></script>-->
<!--<script type="text/javascript" src="staticConn.js"></script>
<script type="text/javascript" src="externalConn.js"></script>-->
>>>>>>> origin/master

<script type="text/javascript" src="externalConn.js"></script>
<!--<script type="text/javascript" src="localConn.js"></script>-->


@@ -48,11 +41,8 @@
addToHomescreen();
</script>
</head>
<<<<<<< HEAD
<body>
=======
<body onload="connection_status()">
>>>>>>> origin/master
<div class="pagecontainer">

<!--HOME-->
13 previous.js → internet_connection.js
View file
@@ -38,7 +38,6 @@
}


<<<<<<< HEAD
function loadStaticXML () {
var dsSponsors = new Spry.Data.XMLDataSet("xml_static_data/sponsors.xml", "recordset/record", {sortOrderOnLoad: "ascending"});
dsSponsors.setColumnType("description", "html");
@@ -116,9 +115,7 @@
dsSocial.setColumnType("sort_order", "number");
dsSocial.setColumnType("date_time", "number");
var delegates = new Spry.Data.XMLDataSet("http://advantagetravel.e-update.co.uk/mobile/data/delegates2.php?view_xml=1", "recordset/record"); }
=======

>>>>>>> origin/master




@@ -149,16 +146,13 @@

if (states[networkState] == 'No network connection') {
alert('It appears you have no network connection. Please switch in your wi-fi or 3G to enable this App');
<<<<<<< HEAD
loadStaticXML ();

=======
>>>>>>> origin/master

};

if (states[networkState] == 'Uknown connection') {
alert('It appears you have no network connection. Please switch in your wi-fi or 3G to enable this App');
<<<<<<< HEAD
loadStaticXML ()
};

@@ -167,9 +161,6 @@
loadDynamicXML ();
};

=======
};
>>>>>>> origin/master

}