phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of github.com:jonatkins/ingress-intel-total-conversion

Browse Source
This commit is contained in:
Philipp Schaefer 2014-04-01 14:30:13 +02:00
commit c8a004e1e1
3 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/portals-list.user.js
View File

@ -2,7 +2,7 @@
// @id iitc-plugin-portals-list@teo96
// @name IITC plugin: show list of portals
// @category Info
// @version 0.1.0.@@DATETIMEVERSION@@
// @version 0.1.1.@@DATETIMEVERSION@@
// @namespace https://github.com/jonatkins/ingress-intel-total-conversion
// @updateURL @@UPDATEURL@@
// @downloadURL @@DOWNLOADURL@@
@ -84,8 +84,8 @@ window.plugin.portalslist.getPortals = function() {
'guid': i,
'teamN': teamN, // TEAM_NONE, TEAM_RES or TEAM_ENL
'team': d.team, // "NEUTRAL", "RESISTANCE" or "ENLIGHTENED"
'name': d.title,
'nameLower': d.title.toLowerCase(),
'name': d.title || '(untitled)',
'nameLower': d.title && d.title.toLowerCase(),
'level': portal.options.level,
'health': d.health,
'resCount': d.resCount,
@ -242,7 +242,7 @@ window.plugin.portalslist.getPortalLink = function(portal,guid) {
var latlng = [coord.lat, coord.lng].join();
var jsSingleClick = 'window.renderPortalDetails(\''+guid+'\');return false';
var jsDoubleClick = 'window.zoomToAndShowPortal(\''+guid+'\', ['+latlng+']);return false';
var perma = '/intel?latE6='+coord.lat+'&lngE6='+coord.lng+'&z=17&pguid='+guid;
var perma = '/intel?ll='+coord.lat+','+coord.lng+'&z=17&pll='+coord.lat+','+coord.lng;
//Use Jquery to create the link, which escape characters in TITLE and ADDRESS of portal
var a = $('<a>',{

2
plugins/regions.user.js
View File

@ -149,7 +149,7 @@ window.plugin.regions.update = function() {
// the six cube side boundaries. we cheat by hard-coding the coords as it's simple enough
var latLngs = [ [45,-180], [35.264389682754654,-135], [35.264389682754654,-45], [35.264389682754654,45], [35.264389682754654,135], [45,180]];
var globalCellOptions = {color: 'red', weight: 7, opacity: 0.5};
var globalCellOptions = {color: 'red', weight: 7, opacity: 0.5, clickable: false };
for (var i=0; i<latLngs.length-1; i++) {
// the geodesic line code can't handle a line/polyline spanning more than (or close to?) 180 degrees, so we draw

41
website/page/test.php
View File

@ -15,6 +15,7 @@ builds.
<?php
include_once ( "code/desktop-download.php" );
include_once ( "code/mobile-download.php" );
$path = "test";
@ -42,25 +43,11 @@ else
{
}
$apkfile = "$path/IITC_Mobile-$path.apk";
?>
<h3 id="test-desktop">Desktop test build</h3>
<?php
iitcDesktopDownload ( $path );
?>
<hr>
<h4>Desktop test plugins</h4>
<?php
iitcDesktopPluginDownloadTable ( $path );
?>
<hr>
<h3 id="test-mobile">Mobile test build</h3>
<div class="alert alert-block alert-info">
@ -70,10 +57,6 @@ Test builds will be called "IITCm Test" - while the regular release builds remai
<?php
include_once ( "code/mobile-download.php" );
$apkfile = "$path/IITC_Mobile-$path.apk";
if ( file_exists($apkfile) )
{
@ -87,5 +70,21 @@ else
?>
<h3 id="test-desktop">Desktop test build</h3>
<?php
iitcDesktopDownload ( $path );
?>
<hr>
<h4>Desktop test plugins</h4>
<?php
iitcDesktopPluginDownloadTable ( $path );
?>
<hr>