From 6bc055491f23e6dbb3cc5b99bc0797e76b59a183 Mon Sep 17 00:00:00 2001 From: Philipp Schaefer Date: Sat, 1 Feb 2014 10:20:21 +0100 Subject: [PATCH 1/3] added preference summary to IITC plugins --- mobile/res/values/strings.xml | 1 + mobile/res/xml/preferences.xml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mobile/res/values/strings.xml b/mobile/res/values/strings.xml index e101cef4..68552943 100644 --- a/mobile/res/values/strings.xml +++ b/mobile/res/values/strings.xml @@ -106,6 +106,7 @@ Misc Tweaks IITC Plugins + Plugins extend/modify the IITC experience. Most plugins known from desktop IITC can be found here. Available plugins Display user location on map Show zoom control diff --git a/mobile/res/xml/preferences.xml b/mobile/res/xml/preferences.xml index 1244770c..14219efd 100644 --- a/mobile/res/xml/preferences.xml +++ b/mobile/res/xml/preferences.xml @@ -36,7 +36,8 @@ android:fragment="com.cradle.iitc_mobile.fragments.PluginsFragment" android:key="pref_plugins" android:persistent="false" - android:title="@string/pref_plugins"> + android:title="@string/pref_plugins" + android:summary="@string/pref_plugins_sum"> @@ -105,4 +106,4 @@ - \ No newline at end of file + From ab371899a64fc42821a90e7a6fe04da2c472cf98 Mon Sep 17 00:00:00 2001 From: Fragger Date: Mon, 3 Feb 2014 08:25:02 -0800 Subject: [PATCH 2/3] Fix details display showing outdated level/faction --- code/portal_detail_display.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js index 486e8051..8a5430c3 100644 --- a/code/portal_detail_display.js +++ b/code/portal_detail_display.js @@ -83,9 +83,8 @@ window.renderPortalDetails = function(guid) { } // portal level. start with basic data - then extend with fractional info in tooltip if available -//FIXME: use details or data if possible, to avoid ambiguity - var levelInt = portal.options.level; - var levelDetails = portal.options.level; + var levelInt = data.level; + var levelDetails = data.level; if (details) { levelDetails = getPortalLevel(details); if(levelDetails != 8) { @@ -126,7 +125,7 @@ window.renderPortalDetails = function(guid) { $('#portaldetails') .html('') //to ensure it's clear - .attr('class', TEAM_TO_CSS[portal.options.team]) //FIXME: use details/data if possible, to avoid ambiguity + .attr('class', TEAM_TO_CSS[teamStringToId(data.team)]) .append( $('

').attr({class:'title'}).text(data.title), From d8431b757fa815d5f4fa912a69e31c587b96b17b Mon Sep 17 00:00:00 2001 From: Fragger Date: Mon, 3 Feb 2014 08:39:41 -0800 Subject: [PATCH 3/3] Opps set level to 0 if team is none --- code/portal_detail_display.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/portal_detail_display.js b/code/portal_detail_display.js index 8a5430c3..4bf4120b 100644 --- a/code/portal_detail_display.js +++ b/code/portal_detail_display.js @@ -83,8 +83,8 @@ window.renderPortalDetails = function(guid) { } // portal level. start with basic data - then extend with fractional info in tooltip if available - var levelInt = data.level; - var levelDetails = data.level; + var levelInt = (teamStringToId(data.team) == TEAM_NONE) ? 0 : data.level; + var levelDetails = levelInt; if (details) { levelDetails = getPortalLevel(details); if(levelDetails != 8) {