diff options
| -rw-r--r-- | Android/AndroidManifest.xml | 6 | ||||
| -rwxr-xr-x | Android/res/xml/config.xml | 1 | ||||
| -rw-r--r-- | iPhone/FixMyStreet/FixMyStreet-Info.plist | 2 | ||||
| -rw-r--r-- | iPhone/FixMyStreet/config.xml | 1 | ||||
| -rw-r--r-- | www/css/fms.css | 3 | ||||
| -rw-r--r-- | www/js/app.js | 7 | ||||
| -rw-r--r-- | www/js/map-OpenLayers.js | 8 | ||||
| -rw-r--r-- | www/js/views/around.js | 3 |
8 files changed, 24 insertions, 7 deletions
diff --git a/Android/AndroidManifest.xml b/Android/AndroidManifest.xml index f012b34..bcc181b 100644 --- a/Android/AndroidManifest.xml +++ b/Android/AndroidManifest.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mysociety.FixMyStreet" - android:versionCode="10" - android:versionName="1.9" > + android:versionCode="11" + android:versionName="2.0" > <uses-sdk - android:minSdkVersion="7" + android:minSdkVersion="8" android:targetSdkVersion="17" /> <supports-screens diff --git a/Android/res/xml/config.xml b/Android/res/xml/config.xml index 8cfd376..bacafc9 100755 --- a/Android/res/xml/config.xml +++ b/Android/res/xml/config.xml @@ -53,6 +53,7 @@ <plugin name="SplashScreen" value="org.apache.cordova.SplashScreen"/> <plugin name="Echo" value="org.apache.cordova.Echo" /> <plugin name="Globalization" value="org.apache.cordova.Globalization"/> + <plugin name="InAppBrowser" value="org.apache.cordova.InAppBrowser"/> </plugins> </cordova> diff --git a/iPhone/FixMyStreet/FixMyStreet-Info.plist b/iPhone/FixMyStreet/FixMyStreet-Info.plist index 170dc4b..46987fc 100644 --- a/iPhone/FixMyStreet/FixMyStreet-Info.plist +++ b/iPhone/FixMyStreet/FixMyStreet-Info.plist @@ -39,7 +39,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>3</string> + <string>4</string> <key>LSRequiresIPhoneOS</key> <true/> <key>NSMainNibFile</key> diff --git a/iPhone/FixMyStreet/config.xml b/iPhone/FixMyStreet/config.xml index 15a0db5..7c76718 100644 --- a/iPhone/FixMyStreet/config.xml +++ b/iPhone/FixMyStreet/config.xml @@ -23,6 +23,7 @@ <plugin name="File" value="CDVFile"/> <plugin name="FileTransfer" value="CDVFileTransfer"/> <plugin name="Geolocation" value="CDVLocation"/> + <plugin name="InAppBrowser" value="CDVInAppBrowser"/> <plugin name="Media" value="CDVSound"/> <plugin name="NetworkStatus" value="CDVConnection"/> <plugin name="Notification" value="CDVNotification"/> diff --git a/www/css/fms.css b/www/css/fms.css index 4a37ba8..c075de7 100644 --- a/www/css/fms.css +++ b/www/css/fms.css @@ -103,8 +103,7 @@ } .frontpage-menu{ - /*padding:0 15px;*/ - padding: 50px 15px 0px 15px; + padding: 0px; } .nodisplay { display: none; diff --git a/www/js/app.js b/www/js/app.js index 06b9e88..3caba69 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -129,6 +129,13 @@ var tpl = { localStorage.currentDraftID = null; }, + openExternal: function(e) { + e.preventDefault(); + var el = $(e.srcElement); + window.open(el.attr('href'), '_system'); + return false; + }, + initialize: function () { if ( this.initialized == 1 ) { return this; diff --git a/www/js/map-OpenLayers.js b/www/js/map-OpenLayers.js index e8defdf..9a0bf67 100644 --- a/www/js/map-OpenLayers.js +++ b/www/js/map-OpenLayers.js @@ -127,6 +127,9 @@ function fixmystreet_onload() { fixmystreet.map.removePopup(popup); popup.destroy(); feature.popup = null; + $('#view-my-reports').show(); + $('#login-options').show(); + $('#OpenLayers_Control_Crosshairs_crosshairs').show(); }); fixmystreet.markers.events.register( 'featureselected', fixmystreet.markers, function(evt) { var feature = evt.feature; @@ -134,11 +137,14 @@ function fixmystreet_onload() { var popup = new OpenLayers.Popup.FramedCloud("popup", feature.geometry.getBounds().getCenterLonLat(), null, - feature.attributes.title + "<br><a href=" + CONFIG.FMS_URL + "/report/" + feature.attributes.id + ">More details</a>", + feature.attributes.title + "<br><a onclick=\"FMS.openExternal(event); return false;\" href=\"" + CONFIG.FMS_URL + "/report/" + feature.attributes.id + "\">More details</a>", { size: new OpenLayers.Size(0,0), offset: new OpenLayers.Pixel(0,-40) }, true, onPopupClose); feature.popup = popup; fixmystreet.map.addPopup(popup); + $('#view-my-reports').hide(); + $('#login-options').hide(); + $('#OpenLayers_Control_Crosshairs_crosshairs').hide(); }); fixmystreet.map.addControl( fixmystreet.select_feature ); fixmystreet.select_feature.activate(); diff --git a/www/js/views/around.js b/www/js/views/around.js index 9bb1abe..ffc712f 100644 --- a/www/js/views/around.js +++ b/www/js/views/around.js @@ -74,6 +74,9 @@ } this.displayButtons(); FMS.locator.trackPosition(); + // FIXME: not sure why I need to do this + fixmystreet.select_feature.deactivate(); + fixmystreet.select_feature.activate(); }, positionUpdate: function( info ) { |