'+match[2]+'';
+ } else {
+ return ver;
+ }
+}
+
+window.plugin.updateCheck.compareDetails = function(web_version, script_version) {
+ // compare the local script version data with the website version data
+ // and return an object with the results
+ var result = {};
+
+ result.webUrl = web_version.pageUrl;
+ result.downloadUrl = web_version.downloadUrl;
+ result.webVersion = web_version.version;
+
+ result.localVersion = script_version.script && script_version.script.version;
+
+ if (result.localVersion && result.webVersion) {
+ result.comp = window.plugin.updateCheck.versionCompare (result.localVersion, result.webVersion);
+
+ result.outOfDate = result.comp>0;
+ result.upToDate = result.comp==0;
+ result.localNewer = result.comp<0;
+
+
+ }
+
+ var webVerHTML = result.webVersion && window.plugin.updateCheck.versionHTML(result.webVersion);
+ var localVerHTML = result.localVersion && window.plugin.updateCheck.versionHTML(result.localVersion);
+
+// var webLinkInstallHTML = '';
+// if (result.downloadUrl && result.webUrl) {
+// webLinkInstallHTML = 'web '
+// + 'install';
+// }
+
+ if (!result.localVersion) {
+ result.html = 'version check failed';
+ } else if (!result.webVersion) {
+ result.html = 'version check failed';
+ } else if (result.upToDate) {
+ result.html = 'up to date';
+ } else if (result.outOfDate) {
+ result.html = 'out of date';
+ } else if (result.localNewer) {
+ result.html = localVerHTML+' is newer than '+webVerHTML+'(?!)';
+ } else {
+ console.warn ('Unknown case of version combinations!');
+ result.html = 'version check failed(!?)';
+ }
+
+ return result;
+}
+
+
+window.plugin.updateCheck.showReport = function(data) {
+ var result = 'WORK IN PROGRESS';
+
+ if (data.error) {
+ result += 'Error checking for updates
'+data.error+'
';
+ } else {
+ if (data.name) {
+ result += 'IITC update check: '+data.name+'
';
+ }
+
+ if (typeof android !== 'undefined' && android) {
+ // mobile app version check
+ var ourVerCode = android.getVersionCode && android.getVersionCode() || 0;
+ var ourVerName = android.getVersionName && android.getVersionName() || '(unknown)';
+
+ if (data.mobile) {
+ var latestVerCode = parseInt(data.mobile.versioncode);
+ var latestVerName = data.mobile.versionstr;
+
+ var webLink = '';
+ if (data.mobile.pageurl) webLink = 'web';
+ var downloadLink = '';
+ if (data.mobile.downloadurl) downloadLink = 'download';
+ if (data.mobile.downloadurl && android.updateIitc) downloadLink = 'install';
+
+
+ if (ourVerCode == latestVerCode) {
+ // up to date
+ result += 'IITC Mobile is up to date - version '+ourVerName+' '+webLink+'
';
+ } else if (ourVerCode < latestVerCode) {
+ // out of date
+ result += 'IITC Mobile is out of date. Current version '+ourVerName+', '
+ + 'Available version '+latestVerName+'. '+webLink+' '+downloadLink+'
';
+ } else {
+ // local version newer?!
+ result += 'IITC Mobile version newer than latest on server?! Current version '+ourVerName+', '
+ + 'Available version '+latestVerName+'.
';
+ }
+
+ } else {
+ result += 'Warning: no version data for mobile app found in response
';
+ }
+ } else {
+ // desktop userscript version check
+ if (data.iitc && window.script_info) {
+ var compare = window.plugin.updateCheck.compareDetails(data.iitc, window.script_info);
+ result += 'IITC Main script: '+compare.html+'
';
+
+ } else {
+ if (!data.iitc) {
+ result += 'Warning: no version information for main IITC script found in response
';
+ }
+ if (!window.script_info) {
+ result += 'Warning: your IITC script does not contain version data
';
+ }
+ }
+ }
+
+ if (data.plugins && window.bootPlugins) {
+
+ var plugins = { upToDate: [], outOfDate: [], other: [] };
+
+ if (window.bootPlugins.length == 0) {
+ result += 'No plugins installed';
+ } else {
+ for (var i=0; iweb');
+ if (downloadlink && p.compare && p.compare.downloadUrl) links.push('download');
+ //now convert to text
+ links = links && links.join(' ') || '-';
+
+ return '| '+name+' | '+statustext+' | '+links+' |
';
+ }
+
+ result += '| Out of date |
|---|
';
+ for (var i in plugins.outOfDate) {
+ result += formatRow (plugins.outOfDate[i],true,true);
+ }
+ if (plugins.outOfDate.length==0) {
+ result += '| no plugins |
';
+ }
+
+ result += '| Up To Date |
|---|
';
+ for (var i in plugins.upToDate) {
+ result += formatRow (plugins.upToDate[i],true,false);
+ }
+ if (plugins.upToDate.length==0) {
+ result += '| no plugins |
';
+ }
+
+ result += '| Other |
|---|
';
+ for (var i in plugins.other) {
+ result += formatRow (plugins.other[i],true,false);
+ }
+ if (plugins.other.length==0) {
+ result += '| no plugins |
';
+ }
+
+ result += '';
+ }
+
+ }
+
+ dialog({
+ width: 700,
+ title: 'Update check',
+ html: result
+ });
+}
+
+
+window.plugin.updateCheck.open = function() {
+
+ // TODO? open a dialog/show a message indicating that the update check is in progress, before the data is loaded?
+ // TODO? prevent loading the version data every time - cache it, with a user option to force fresh data
+
+ window.plugin.updateCheck.loadVersionData();
+}
+
+
+
+window.plugin.updateCheck.setup = function() {
+ $('#toolbox').append(' Update check');
+};
+
+var setup = window.plugin.updateCheck.setup;
+
+// PLUGIN END //////////////////////////////////////////////////////////
+
+@@PLUGINEND@@
diff --git a/style.css b/style.css
index a368573e..a04b3086 100644
--- a/style.css
+++ b/style.css
@@ -982,3 +982,53 @@ td + td {
display: none;
}
+
+
+/* leaflet popups - restyle to match the theme of IITC */
+#map .leaflet-popup {
+ pointer-events: none;
+}
+
+#map .leaflet-popup-content-wrapper {
+ border-radius: 0px;
+ -webkit-border-radius: 0px;
+ border: 1px solid #20A8B1;
+ background: #0e3d4e;
+ pointer-events: auto;
+}
+
+#map .leaflet-popup-content {
+ color: #ffce00;
+ margin: 5px 8px;
+}
+
+#map .leaflet-popup-close-button {
+ padding: 2px 1px 0 0;
+ font-size: 12px;
+ line-height: 8px;
+ width: 10px;
+ height: 10px;
+ pointer-events: auto;
+}
+
+
+#map .leaflet-popup-tip {
+ /* change the tip from an arrow to a simple line */
+ background: #20A8B1;
+ width: 1px;
+ height: 20px;
+ padding: 0;
+ margin: 0 0 0 20px;
+ -webkit-transform: none;
+ -moz-transform: none;
+ -ms-transform: none;
+ -o-transform: none;
+ transform: none;
+}
+
+
+/* misc */
+
+.no-pointer-events {
+ pointer-events: none;
+}
diff --git a/website/page/code/apk/ApkParser.php b/website/code/apk/ApkParser.php
similarity index 100%
rename from website/page/code/apk/ApkParser.php
rename to website/code/apk/ApkParser.php
diff --git a/website/page/code/apk/lib/ApkAndroidPlatform.php b/website/code/apk/lib/ApkAndroidPlatform.php
similarity index 100%
rename from website/page/code/apk/lib/ApkAndroidPlatform.php
rename to website/code/apk/lib/ApkAndroidPlatform.php
diff --git a/website/page/code/apk/lib/ApkArchive.php b/website/code/apk/lib/ApkArchive.php
similarity index 100%
rename from website/page/code/apk/lib/ApkArchive.php
rename to website/code/apk/lib/ApkArchive.php
diff --git a/website/page/code/apk/lib/ApkManifest.php b/website/code/apk/lib/ApkManifest.php
similarity index 100%
rename from website/page/code/apk/lib/ApkManifest.php
rename to website/code/apk/lib/ApkManifest.php
diff --git a/website/page/code/apk/lib/ApkManifestXmlElement.php b/website/code/apk/lib/ApkManifestXmlElement.php
similarity index 100%
rename from website/page/code/apk/lib/ApkManifestXmlElement.php
rename to website/code/apk/lib/ApkManifestXmlElement.php
diff --git a/website/page/code/apk/lib/ApkStream.php b/website/code/apk/lib/ApkStream.php
similarity index 100%
rename from website/page/code/apk/lib/ApkStream.php
rename to website/code/apk/lib/ApkStream.php
diff --git a/website/page/code/apk/lib/ApkXml.php b/website/code/apk/lib/ApkXml.php
similarity index 100%
rename from website/page/code/apk/lib/ApkXml.php
rename to website/code/apk/lib/ApkXml.php
diff --git a/website/page/code/apk/lib/ApkXmlParser.php b/website/code/apk/lib/ApkXmlParser.php
similarity index 100%
rename from website/page/code/apk/lib/ApkXmlParser.php
rename to website/code/apk/lib/ApkXmlParser.php
diff --git a/website/page/code/desktop-download.php b/website/code/desktop-download.php
similarity index 97%
rename from website/page/code/desktop-download.php
rename to website/code/desktop-download.php
index 7b18901d..5f1046e1 100644
--- a/website/page/code/desktop-download.php
+++ b/website/code/desktop-download.php
@@ -25,7 +25,7 @@ function loadPopularity()
{
$items = explode ( ' ', $line );
$popularity[$items[0]] = (int)$items[1];
- }
+ }
}
return $popularity;
@@ -33,10 +33,10 @@ function loadPopularity()
function popularity_cmp ( $a, $b )
{
- if ( $a['popularity'] == $b['popularity'] )
+ if ( @$a['popularity'] == @$b['popularity'] )
return 0;
// sort from highest to lowest
- return ($a['popularity'] > $b['popularity']) ? -1 : 1;
+ return (@$a['popularity'] > @$b['popularity']) ? -1 : 1;
}
diff --git a/website/page/code/mobile-download.php b/website/code/mobile-download.php
similarity index 96%
rename from website/page/code/mobile-download.php
rename to website/code/mobile-download.php
index 9322a9ee..f0eb1fc3 100644
--- a/website/page/code/mobile-download.php
+++ b/website/code/mobile-download.php
@@ -19,8 +19,6 @@ function getMobileVersion ( $apkfile )
$archive = $apkinfo->getApkArchive();
$stream = $archive->getStream ( "assets/total-conversion-build.user.js" );
- if ( ! $stream )
- $stream = $archive->getStream ( "assets/iitc.js" );
if ( $stream )
{
diff --git a/website/page/code/url/CHANGELOG.txt b/website/code/url/CHANGELOG.txt
similarity index 100%
rename from website/page/code/url/CHANGELOG.txt
rename to website/code/url/CHANGELOG.txt
diff --git a/website/page/code/url/README.txt b/website/code/url/README.txt
similarity index 100%
rename from website/page/code/url/README.txt
rename to website/code/url/README.txt
diff --git a/website/page/code/url/url_to_absolute.php b/website/code/url/url_to_absolute.php
similarity index 100%
rename from website/page/code/url/url_to_absolute.php
rename to website/code/url/url_to_absolute.php
diff --git a/website/page/code/userscript.php b/website/code/userscript.php
similarity index 100%
rename from website/page/code/userscript.php
rename to website/code/userscript.php
diff --git a/website/index.php b/website/index.php
index 2d01c87b..62f57091 100644
--- a/website/index.php
+++ b/website/index.php
@@ -68,6 +68,20 @@ if ( file_exists ( 'tracking.php' ) )
- a place to ask for help and discuss with other users.
+
+
+
+
Note: A change has been detected to the standard intel website. Such changes usually break IITC.
+ The developers have been notified of the update, and will be looking to fix things as soon as possible.
+ See the
IITC Community
+ for the latest details.
+