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

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

Browse Source
This commit is contained in:
Jon Atkins 2014-02-03 17:27:47 +00:00
commit 6056cd488f
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/portal_detail_display.js
View File

@ -83,9 +83,8 @@ window.renderPortalDetails = function(guid) {
} }
// portal level. start with basic data - then extend with fractional info in tooltip if available // 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 = (teamStringToId(data.team) == TEAM_NONE) ? 0 : data.level;
var levelInt = portal.options.level; var levelDetails = levelInt;
var levelDetails = portal.options.level;
if (details) { if (details) {
levelDetails = getPortalLevel(details); levelDetails = getPortalLevel(details);
if(levelDetails != 8) { if(levelDetails != 8) {
@ -126,7 +125,7 @@ window.renderPortalDetails = function(guid) {
$('#portaldetails') $('#portaldetails')
.html('') //to ensure it's clear .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( .append(
$('<h3>').attr({class:'title'}).text(data.title), $('<h3>').attr({class:'title'}).text(data.title),

1
mobile/res/values/strings.xml
View File

@ -106,6 +106,7 @@
<string name="pref_misc_cat">Misc</string> <string name="pref_misc_cat">Misc</string>
<string name="pref_tweaks_cat">Tweaks</string> <string name="pref_tweaks_cat">Tweaks</string>
<string name="pref_plugins">IITC Plugins</string> <string name="pref_plugins">IITC Plugins</string>
<string name="pref_plugins_sum">Plugins extend/modify the IITC experience. Most plugins known from desktop IITC can be found here.</string>
<string name="pref_plugins_title">Available plugins</string> <string name="pref_plugins_title">Available plugins</string>
<string name="pref_user_location">Display user location on map</string> <string name="pref_user_location">Display user location on map</string>
<string name="pref_user_zoom">Show zoom control</string> <string name="pref_user_zoom">Show zoom control</string>

3
mobile/res/xml/preferences.xml
View File

@ -36,7 +36,8 @@
android:fragment="com.cradle.iitc_mobile.fragments.PluginsFragment" android:fragment="com.cradle.iitc_mobile.fragments.PluginsFragment"
android:key="pref_plugins" android:key="pref_plugins"
android:persistent="false" android:persistent="false"
android:title="@string/pref_plugins"> android:title="@string/pref_plugins"
android:summary="@string/pref_plugins_sum">
<intent <intent
android:targetClass="com.cradle.iitc_mobile.IITC_PluginPreferenceActivity" android:targetClass="com.cradle.iitc_mobile.IITC_PluginPreferenceActivity"
android:targetPackage="com.cradle.iitc_mobile"/> android:targetPackage="com.cradle.iitc_mobile"/>