diff options
58 files changed, 468 insertions, 314 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index 967c4d41..0d747972 100755 --- a/StoneIsland/config.xml +++ b/StoneIsland/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.4.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="us.okfoc.stoneisland" version="0.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>Stone Island</name> <description> Stone Island @@ -28,6 +28,7 @@ <preference name="StatusBarOverlaysWebView" value="false" /> <preference name="StatusBarBackgroundColor" value="#000000" /> <preference name="StatusBarStyle" value="lightcontent" /> + <preference name="SplashMaintainAspectRatio" value="true" /> <platform name="android"> <allow-intent href="market:*" /> diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties index 42797afa..378a9612 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties @@ -1 +1 @@ -#Fri Dec 04 16:33:05 CST 2015
+#Tue Dec 29 00:15:00 CST 2015
diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock Binary files differindex ef0f1bfc..eefa2205 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/cache.properties.lock diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin Binary files differindex df09485f..1b044ece 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileHashes.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary files differindex 1e0a68c2..45955f6e 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary files differindex bf947b14..bd8c4043 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/outputFileStates.bin diff --git a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary files differindex b2581f89..4b42afed 100755 --- a/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin +++ b/StoneIsland/platforms/android/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin diff --git a/StoneIsland/platforms/android/AndroidManifest.xml b/StoneIsland/platforms/android/AndroidManifest.xml index 0feefa18..ac905064 100755 --- a/StoneIsland/platforms/android/AndroidManifest.xml +++ b/StoneIsland/platforms/android/AndroidManifest.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<manifest android:hardwareAccelerated="true" android:versionCode="401" android:versionName="0.4.1" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android"> +<manifest android:hardwareAccelerated="true" android:versionCode="404" android:versionName="0.4.4" package="us.okfoc.stoneisland" xmlns:android="http://schemas.android.com/apk/res/android"> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" /> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> @@ -17,24 +17,6 @@ <category android:name="android.intent.category.BROWSABLE" /> </intent-filter> </activity> - <activity android:exported="true" android:name="com.adobe.phonegap.push.PushHandlerActivity" /> - <receiver android:exported="true" android:name="com.google.android.gms.gcm.GcmReceiver" android:permission="com.google.android.c2dm.permission.SEND"> - <intent-filter> - <action android:name="com.google.android.c2dm.intent.RECEIVE" /> - <category android:name="us.okfoc.stoneisland" /> - </intent-filter> - </receiver> - <service android:exported="false" android:name="com.adobe.phonegap.push.GCMIntentService"> - <intent-filter> - <action android:name="com.google.android.c2dm.intent.RECEIVE" /> - </intent-filter> - </service> - <service android:exported="false" android:name="com.adobe.phonegap.push.PushInstanceIDListenerService"> - <intent-filter> - <action android:name="com.google.android.gms.iid.InstanceID" /> - </intent-filter> - </service> - <service android:exported="false" android:name="com.adobe.phonegap.push.RegistrationIntentService" /> <service android:name="com.parse.PushService" /> <receiver android:name="com.parse.ParseBroadcastReceiver"> <intent-filter> @@ -56,16 +38,34 @@ <category android:name="us.okfoc.stoneisland" /> </intent-filter> </receiver> + <activity android:exported="true" android:name="com.adobe.phonegap.push.PushHandlerActivity" /> + <receiver android:exported="true" android:name="com.google.android.gms.gcm.GcmReceiver" android:permission="com.google.android.c2dm.permission.SEND"> + <intent-filter> + <action android:name="com.google.android.c2dm.intent.RECEIVE" /> + <category android:name="us.okfoc.stoneisland" /> + </intent-filter> + </receiver> + <service android:exported="false" android:name="com.adobe.phonegap.push.GCMIntentService"> + <intent-filter> + <action android:name="com.google.android.c2dm.intent.RECEIVE" /> + </intent-filter> + </service> + <service android:exported="false" android:name="com.adobe.phonegap.push.PushInstanceIDListenerService"> + <intent-filter> + <action android:name="com.google.android.gms.iid.InstanceID" /> + </intent-filter> + </service> + <service android:exported="false" android:name="com.adobe.phonegap.push.RegistrationIntentService" /> </application> <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="22" /> - <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> - <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WAKE_LOCK" /> + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.VIBRATE" /> + <uses-permission android:name="android.permission.GET_ACCOUNTS" /> <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> <permission android:name="us.okfoc.stoneisland.permission.C2D_MESSAGE" android:protectionLevel="signature" /> <uses-permission android:name="us.okfoc.stoneisland.permission.C2D_MESSAGE" /> - <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> - <uses-permission android:name="android.permission.GET_ACCOUNTS" /> + <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> + <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> </manifest> diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar Binary files differindex 2e52b1df..49f55953 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/debug/classes.jar diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar Binary files differindex 4cc8c303..936f1242 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/bundles/release/classes.jar diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml index c2035cd4..ac889fce 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/debug/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
\ No newline at end of file +<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="debug"><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\src\debug\assets"/></dataSet></merger>
\ No newline at end of file diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/release/merger.xml b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/release/merger.xml index a4369060..f7b7f2e4 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/release/merger.xml +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/mergeAssets/release/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="release"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\src\release\assets"/></dataSet></merger>
\ No newline at end of file +<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\assets"/></dataSet><dataSet config="release"><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\src\release\assets"/></dataSet></merger>
\ No newline at end of file diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml index 45310184..d7194667 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/debug/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\res"/><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file +<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\res"/><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\build\generated\res\rs\debug"/><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\src\debug\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file diff --git a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/release/merger.xml b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/release/merger.xml index 4b722ce0..d231378a 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/release/merger.xml +++ b/StoneIsland/platforms/android/CordovaLib/build/intermediates/incremental/packageResources/release/merger.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8"?> -<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\res"/><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\build\generated\res\rs\release"/><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\build\generated\res\generated\release"/></dataSet><dataSet config="release"><source path="C:\cygwin64\home\xxx\gh\mfx2\StoneIsland\platforms\android\CordovaLib\src\release\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file +<merger version="3"><dataSet config="main"><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\res"/><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\build\generated\res\rs\release"/><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\build\generated\res\generated\release"/></dataSet><dataSet config="release"><source path="C:\cygwin64\home\xxx\git2\stone-island\StoneIsland\platforms\android\CordovaLib\src\release\res"/></dataSet><mergedItems/></merger>
\ No newline at end of file diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar Binary files differindex c943da67..f94679fc 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar +++ b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-debug.aar diff --git a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar Binary files differindex a77826ed..805a1c32 100755 --- a/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar +++ b/StoneIsland/platforms/android/CordovaLib/build/outputs/aar/CordovaLib-release.aar diff --git a/StoneIsland/platforms/android/android.json b/StoneIsland/platforms/android/android.json index 62549cb8..1612e00a 100755 --- a/StoneIsland/platforms/android/android.json +++ b/StoneIsland/platforms/android/android.json @@ -13,6 +13,10 @@ "count": 1 }, { + "xml": "<feature name=\"ParsePlugin\"><param name=\"android-package\" value=\"org.apache.cordova.core.ParsePlugin\" /></feature>", + "count": 1 + }, + { "xml": "<feature name=\"LaunchMyApp\"><param name=\"android-package\" value=\"nl.xservices.plugins.LaunchMyApp\" /></feature>", "count": 1 }, @@ -47,37 +51,47 @@ { "xml": "<feature name=\"PushNotification\"><param name=\"android-package\" value=\"com.adobe.phonegap.push.PushPlugin\" /></feature>", "count": 1 - }, - { - "xml": "<feature name=\"ParsePlugin\"><param name=\"android-package\" value=\"org.apache.cordova.core.ParsePlugin\" /></feature>", - "count": 1 } ] } }, "AndroidManifest.xml": { "parents": { - "/*/application/activity": [ + "/manifest/application": [ { - "xml": "<intent-filter><data android:scheme=\"stoneisland\" /><action android:name=\"android.intent.action.VIEW\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"android.intent.category.BROWSABLE\" /></intent-filter>", + "xml": "<service android:name=\"com.parse.PushService\" />", "count": 1 - } - ], - "/*": [ + }, { - "xml": "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />", + "xml": "<receiver android:name=\"com.parse.ParseBroadcastReceiver\"><intent-filter><action android:name=\"android.intent.action.BOOT_COMPLETED\" /><action android:name=\"android.intent.action.USER_PRESENT\" /></intent-filter></receiver>", "count": 1 }, { - "xml": "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />", + "xml": "<receiver android:exported=\"false\" android:name=\"org.apache.cordova.core.ParsePluginReceiver\"><intent-filter><action android:name=\"com.parse.push.intent.RECEIVE\" /><action android:name=\"com.parse.push.intent.DELETE\" /><action android:name=\"com.parse.push.intent.OPEN\" /></intent-filter></receiver>", "count": 1 }, { - "xml": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />", + "xml": "<receiver android:name=\"com.parse.GcmBroadcastReceiver\" android:permission=\"com.google.android.c2dm.permission.SEND\"><intent-filter><action android:name=\"com.google.android.c2dm.intent.RECEIVE\" /><action android:name=\"com.google.android.c2dm.intent.REGISTRATION\" /><category android:name=\"us.okfoc.stoneisland\" /></intent-filter></receiver>", "count": 1 }, { - "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />", + "xml": "<activity android:exported=\"true\" android:name=\"com.adobe.phonegap.push.PushHandlerActivity\" />", + "count": 1 + }, + { + "xml": "<receiver android:exported=\"true\" android:name=\"com.google.android.gms.gcm.GcmReceiver\" android:permission=\"com.google.android.c2dm.permission.SEND\"><intent-filter><action android:name=\"com.google.android.c2dm.intent.RECEIVE\" /><category android:name=\"us.okfoc.stoneisland\" /></intent-filter></receiver>", + "count": 1 + }, + { + "xml": "<service android:exported=\"false\" android:name=\"com.adobe.phonegap.push.GCMIntentService\"><intent-filter><action android:name=\"com.google.android.c2dm.intent.RECEIVE\" /></intent-filter></service>", + "count": 1 + }, + { + "xml": "<service android:exported=\"false\" android:name=\"com.adobe.phonegap.push.PushInstanceIDListenerService\"><intent-filter><action android:name=\"com.google.android.gms.iid.InstanceID\" /></intent-filter></service>", + "count": 1 + }, + { + "xml": "<service android:exported=\"false\" android:name=\"com.adobe.phonegap.push.RegistrationIntentService\"></service>", "count": 1 } ], @@ -95,10 +109,18 @@ "count": 2 }, { + "xml": "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\" />", + "count": 1 + }, + { "xml": "<uses-permission android:name=\"android.permission.VIBRATE\" />", "count": 2 }, { + "xml": "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\" />", + "count": 1 + }, + { "xml": "<uses-permission android:name=\"com.google.android.c2dm.permission.RECEIVE\" />", "count": 2 }, @@ -109,51 +131,29 @@ { "xml": "<uses-permission android:name=\"us.okfoc.stoneisland.permission.C2D_MESSAGE\" />", "count": 2 - }, - { - "xml": "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\" />", - "count": 1 - }, - { - "xml": "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\" />", - "count": 1 } ], - "/manifest/application": [ - { - "xml": "<activity android:exported=\"true\" android:name=\"com.adobe.phonegap.push.PushHandlerActivity\" />", - "count": 1 - }, - { - "xml": "<receiver android:exported=\"true\" android:name=\"com.google.android.gms.gcm.GcmReceiver\" android:permission=\"com.google.android.c2dm.permission.SEND\"><intent-filter><action android:name=\"com.google.android.c2dm.intent.RECEIVE\" /><category android:name=\"us.okfoc.stoneisland\" /></intent-filter></receiver>", - "count": 1 - }, - { - "xml": "<service android:exported=\"false\" android:name=\"com.adobe.phonegap.push.GCMIntentService\"><intent-filter><action android:name=\"com.google.android.c2dm.intent.RECEIVE\" /></intent-filter></service>", - "count": 1 - }, - { - "xml": "<service android:exported=\"false\" android:name=\"com.adobe.phonegap.push.PushInstanceIDListenerService\"><intent-filter><action android:name=\"com.google.android.gms.iid.InstanceID\" /></intent-filter></service>", - "count": 1 - }, + "/*/application/activity": [ { - "xml": "<service android:exported=\"false\" android:name=\"com.adobe.phonegap.push.RegistrationIntentService\"></service>", + "xml": "<intent-filter><data android:scheme=\"stoneisland\" /><action android:name=\"android.intent.action.VIEW\" /><category android:name=\"android.intent.category.DEFAULT\" /><category android:name=\"android.intent.category.BROWSABLE\" /></intent-filter>", "count": 1 - }, + } + ], + "/*": [ { - "xml": "<service android:name=\"com.parse.PushService\" />", + "xml": "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\" />", "count": 1 }, { - "xml": "<receiver android:name=\"com.parse.ParseBroadcastReceiver\"><intent-filter><action android:name=\"android.intent.action.BOOT_COMPLETED\" /><action android:name=\"android.intent.action.USER_PRESENT\" /></intent-filter></receiver>", + "xml": "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\" />", "count": 1 }, { - "xml": "<receiver android:exported=\"false\" android:name=\"org.apache.cordova.core.ParsePluginReceiver\"><intent-filter><action android:name=\"com.parse.push.intent.RECEIVE\" /><action android:name=\"com.parse.push.intent.DELETE\" /><action android:name=\"com.parse.push.intent.OPEN\" /></intent-filter></receiver>", + "xml": "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\" />", "count": 1 }, { - "xml": "<receiver android:name=\"com.parse.GcmBroadcastReceiver\" android:permission=\"com.google.android.c2dm.permission.SEND\"><intent-filter><action android:name=\"com.google.android.c2dm.intent.RECEIVE\" /><action android:name=\"com.google.android.c2dm.intent.REGISTRATION\" /><category android:name=\"us.okfoc.stoneisland\" /></intent-filter></receiver>", + "xml": "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\" />", "count": 1 } ] @@ -179,6 +179,11 @@ "com.ionic.keyboard": { "PACKAGE_NAME": "us.okfoc.stoneisland" }, + "com.parse.cordova.core.pushplugin": { + "APP_ID": "GS82ZxpN8Mecpc53rsyu6aLLGK0W4CKi42J25DLB", + "CLIENT_KEY": "hQRtQfsgimYnX5PMivtcdXCG9eZhESeyTr0Rd8Sv", + "PACKAGE_NAME": "us.okfoc.stoneisland" + }, "cordova-plugin-console": { "PACKAGE_NAME": "us.okfoc.stoneisland" }, @@ -212,11 +217,6 @@ }, "phonegap-plugin-push": { "PACKAGE_NAME": "us.okfoc.stoneisland" - }, - "com.parse.cordova.core.pushplugin": { - "APP_ID": "GS82ZxpN8Mecpc53rsyu6aLLGK0W4CKi42J25DLB", - "CLIENT_KEY": "hQRtQfsgimYnX5PMivtcdXCG9eZhESeyTr0Rd8Sv", - "PACKAGE_NAME": "us.okfoc.stoneisland" } }, "dependent_plugins": {}, @@ -230,6 +230,14 @@ ] }, { + "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", + "id": "com.parse.cordova.core.pushplugin.ParsePlugin", + "pluginId": "com.parse.cordova.core.pushplugin", + "clobbers": [ + "window.parsePlugin" + ] + }, + { "file": "plugins/cordova-plugin-console/www/logger.js", "id": "cordova-plugin-console.logger", "pluginId": "cordova-plugin-console", @@ -332,18 +340,11 @@ "clobbers": [ "PushNotification" ] - }, - { - "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", - "id": "com.parse.cordova.core.pushplugin.ParsePlugin", - "pluginId": "com.parse.cordova.core.pushplugin", - "clobbers": [ - "window.parsePlugin" - ] } ], "plugin_metadata": { "com.ionic.keyboard": "1.0.4", + "com.parse.cordova.core.pushplugin": "0.1.0", "cordova-plugin-console": "1.0.1", "cordova-plugin-customurlscheme": "4.0.0", "cordova-plugin-device": "1.0.1", @@ -354,7 +355,6 @@ "cordova-plugin-splashscreen": "2.1.0", "cordova-plugin-whitelist": "1.0.0", "cordova-plugin-x-socialsharing": "5.0.7", - "phonegap-plugin-push": "1.4.4", - "com.parse.cordova.core.pushplugin": "0.1.0" + "phonegap-plugin-push": "1.4.4" } }
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/cordova_plugins.js b/StoneIsland/platforms/android/assets/www/cordova_plugins.js index eec97542..90fa7c51 100755 --- a/StoneIsland/platforms/android/assets/www/cordova_plugins.js +++ b/StoneIsland/platforms/android/assets/www/cordova_plugins.js @@ -9,6 +9,14 @@ module.exports = [ ] }, { + "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", + "id": "com.parse.cordova.core.pushplugin.ParsePlugin", + "pluginId": "com.parse.cordova.core.pushplugin", + "clobbers": [ + "window.parsePlugin" + ] + }, + { "file": "plugins/cordova-plugin-console/www/logger.js", "id": "cordova-plugin-console.logger", "pluginId": "cordova-plugin-console", @@ -111,20 +119,13 @@ module.exports = [ "clobbers": [ "PushNotification" ] - }, - { - "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", - "id": "com.parse.cordova.core.pushplugin.ParsePlugin", - "pluginId": "com.parse.cordova.core.pushplugin", - "clobbers": [ - "window.parsePlugin" - ] } ]; module.exports.metadata = // TOP OF METADATA { "com.ionic.keyboard": "1.0.4", + "com.parse.cordova.core.pushplugin": "0.1.0", "cordova-plugin-console": "1.0.1", "cordova-plugin-customurlscheme": "4.0.0", "cordova-plugin-device": "1.0.1", @@ -135,8 +136,7 @@ module.exports.metadata = "cordova-plugin-splashscreen": "2.1.0", "cordova-plugin-whitelist": "1.0.0", "cordova-plugin-x-socialsharing": "5.0.7", - "phonegap-plugin-push": "1.4.4", - "com.parse.cordova.core.pushplugin": "0.1.0" + "phonegap-plugin-push": "1.4.4" } // BOTTOM OF METADATA });
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/css/account.css b/StoneIsland/platforms/android/assets/www/css/account.css index fbb960d0..b77cd428 100755 --- a/StoneIsland/platforms/android/assets/www/css/account.css +++ b/StoneIsland/platforms/android/assets/www/css/account.css @@ -172,7 +172,17 @@ input[type=text], input[type=password], input[type=number], input[type=email] { border-right: 1px solid #a9a9a9; } -.toggle-container { +#signup .toggle-container, #profile .toggle-container { + margin: 0px auto; + display: table; + margin-top: 0px; + width: calc(100vw - 10px); + box-sizing: border-box; + padding:0px 18px 2px; + font-size:14px; +} + +#settings .toggle-container { margin: 0px auto; display: table; margin-top: 10px; @@ -285,23 +295,29 @@ input.switch:checked + label:after { } .container-fill { - min-height:50px; + min-height:80px; flex: 1; align-items: center; justify-content: center; position:relative; } +.container-fill-condensed { + min-height:38px!important; +} + .container-row .container-message { color:#000; text-align:center; width:calc(100vw - 10px); box-sizing:border-box; - margin:10px auto; + margin:10px auto 0; position:relative - } +.container-row .container-message-condensed { + margin: 2px auto!important +} .container-fill .container-message { font-size:12px; letter-spacing:0.5px; @@ -337,15 +353,19 @@ input.switch:checked + label:after { margin:0 auto; } +#signup .checkbox-container { + margin-top:12px!important +} + .checkbox-toggle { display:table-cell; box-sizing:border-box; - padding-right:15px; + padding-right:0px; position:relative; } .checkbox-toggle input { - width: 50px; + width: 45px; height: 35px; opacity: 0; z-index: 99999; @@ -495,4 +515,15 @@ margin-top:0px #login .container-row input:first-child { margin-bottom:9px!important +} + +.newuser { + display:inline-block; + padding:14px; + text-decoration:underline +} + +.forgotpassword { + padding:14px; + text-decoration:underline }
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/css/blogs.css b/StoneIsland/platforms/android/assets/www/css/blogs.css index 7af45c4f..8b27dda9 100755 --- a/StoneIsland/platforms/android/assets/www/css/blogs.css +++ b/StoneIsland/platforms/android/assets/www/css/blogs.css @@ -129,6 +129,7 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; + animation: gallery-fade 4s forwards; } .gallery-right { @@ -150,8 +151,15 @@ animation: mfadein 0.6s; z-index:2; position:absolute; display:block; + animation: gallery-fade 4s forwards; } +@-webkit-keyframes gallery-fade { + 0%{opacity:0} + 20%{opacity:1} + 78% {opacity:1} + 100% {opacity:0} +} /* NOTE: not sure if this down arrow is necessary.. the fade might do..? what do you think? it can be removed with javascript when the body hits the bottom of diff --git a/StoneIsland/platforms/android/assets/www/css/cart.css b/StoneIsland/platforms/android/assets/www/css/cart.css index 9fbc54b3..5c910eb4 100755 --- a/StoneIsland/platforms/android/assets/www/css/cart.css +++ b/StoneIsland/platforms/android/assets/www/css/cart.css @@ -355,4 +355,8 @@ color:#000; #cart_shipping .half-input input { margin-top:0px +} + +#cart .scroll, #payment .scroll, #shipping .scroll, #signup .scroll { + min-height:calc(100% + 100px) }
\ No newline at end of file diff --git a/StoneIsland/platforms/android/assets/www/css/nav.css b/StoneIsland/platforms/android/assets/www/css/nav.css index c769dabd..05e4aedc 100755 --- a/StoneIsland/platforms/android/assets/www/css/nav.css +++ b/StoneIsland/platforms/android/assets/www/css/nav.css @@ -81,7 +81,7 @@ font-size: 14px; letter-spacing:1.25px; color: #bbb; - padding: 4px 0 7px 20px + padding: 4px 0 12px 20px } #nav .social { @@ -321,20 +321,46 @@ padding-bottom:0px; #selector { display: none; position: absolute; - bottom: 0; left: 0; background: #fff; z-index: 2; - width:100%; - box-sizing:border-box + box-sizing:border-box; + min-width:100px; + animation: selector-spring .15s forwards; + animation-timing-function: cubic-bezier(.43,1,.89,.95) } + +@keyframes selector-spring { + 0% { + margin-top: 15px + } + 100% { + margin-top: 0 + } +} + #selector .options div { - width: 100%; background: white; text-align: center; - padding: 8px; - + padding: 7px 12px; box-sizing:border-box; font-size: 14px; + border-left:1px solid black; + border-right:1px solid black; + border-top:1px solid black; + +} + +#selector .options div:last-of-type { + border-bottom:1px solid black +} + +.selector-full { + width: 100% !important; + box-sizing:border-box +} + +.selector-full > div > div { + padding: 12px 0 !important; } /* CONTENT */ @@ -369,6 +395,10 @@ h1 { } .msg { - padding: 20px; + margin: 20px; display: inline-block; } + +.msg-condensed { + margin:6px!important; +} diff --git a/StoneIsland/platforms/android/assets/www/css/products.css b/StoneIsland/platforms/android/assets/www/css/products.css index bc215573..52de76d0 100755 --- a/StoneIsland/platforms/android/assets/www/css/products.css +++ b/StoneIsland/platforms/android/assets/www/css/products.css @@ -22,6 +22,7 @@ } #product .style { text-transform: uppercase; + box-sizing:border-box } #product.loading #gallery, @@ -117,7 +118,8 @@ .product .size { padding-right:16px; - position:relative + position:relative; + box-sizing:border-box } .product .price { diff --git a/StoneIsland/platforms/android/assets/www/index.html b/StoneIsland/platforms/android/assets/www/index.html index 5b949646..b9dd0a91 100755 --- a/StoneIsland/platforms/android/assets/www/index.html +++ b/StoneIsland/platforms/android/assets/www/index.html @@ -195,7 +195,7 @@ </div> <div class="heading"> <h1>ARCHIVE</h1> - <div class="subtitle">'982-'015</div> + <div class="subtitle">'982'015</div> </div> </div> @@ -316,7 +316,8 @@ </div> <div class="container-fill"> <div class="container-message premessage"> - <span class="newuser">New User?</span> + <div class="newuser">New User?</div> + <div class="forgotpassword">Forgot Password?</div> </div> <div class="container-message submessage"> <span class="msg"></span> @@ -352,47 +353,28 @@ <input type="email" name="ConfirmEmail" placeholder="CONFIRM EMAIL ADDRESS" required> <div class="select-wrapper date-wrapper"> <span>BIRTHDAY (MM/DD/YYYY)</span> - <input type="date" name="BirthDay" placeholder="BIRTHDAY (MM/DD/YYYY)" required> + <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required> </div> <h2>PASSWORD</h2> <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required> <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required> </div> - <div class="container-row"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> - - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-signup" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-signup"></label> - </div> - </div> <div class="container-row"> - <div class="checkbox-container"> + <div class="checkbox-container "> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input id="checkbox-data-profiling" type="checkbox" name="DataProfiling" value="true" required> + <input type="checkbox" id="checkbox-data-profiling" name="DataProfiling" value="true" required> <label for="checkbox-data-profiling"></label> </div> <label class="checkbox-caption" for="checkbox-data-profiling"> I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions). </label> - </div> + </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling2" value="true" required> + <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required> <label for="checkbox-shopping-data-profiling"></label> </div> <label class="checkbox-caption" for="checkbox-shopping-data-profiling"> @@ -420,36 +402,33 @@ <input type="email" name="Email" placeholder="EMAIL ADDRESS" required> <div class="select-wrapper date-wrapper"> <span>BIRTHDAY (MM/DD/YYYY)</span> - <input type="date" name="BirthDay" placeholder="BIRTHDAY (MM/DD/YYYY)" required> + <input type="date" name="BirthDay" min="1900-01-01" placeholder="BIRTHDAY (MM/DD/YYYY)" required> </div> <h2>CHANGE PASSWORD</h2> <input type="password" name="CurrentPassword" placeholder="CURRENT PASSWORD" required> <input type="password" name="NewPassword" placeholder="NEW PASSWORD (7 CHARACTERS OR MORE)" required> - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-profile"></label> + <div class="container-fill container-fill-condensed"> + <div class="container-message container-message-condensed"> + <span class="msg msg-condensed"> + </span> </div> </div> <div class="container-row"> <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input id="checkbox-data-profiling-profile" type="checkbox" name="DataProfiling" value="true" required> - <label for="checkbox-data-profiling-profile"></label> + <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required> + <label for="receive-newsletter-profile"></label> </div> - <label class="checkbox-caption" for="checkbox-data-profiling-profile"> - I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions). + <label class="checkbox-caption" for="receive-newsletter-profile"> + <b>Newsletter</b><br> + Receive Stone Island Newsletter </label> </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling2" value="true" required> + <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required> <label for="checkbox-shopping-data-profiling-profile"></label> </div> <label class="checkbox-caption" for="checkbox-shopping-data-profiling-profile"> @@ -462,14 +441,6 @@ </div> </div> </div> - <div class="container-fill"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> </div> </form> </div> @@ -730,21 +701,21 @@ <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input id="express-shipping" type="radio" name="ShippingType" value="Express" required> + <input id="express-shipping" type="radio" name="ShippingType" value="Express" checked required> <label for="express-shipping"></label> </div> <label class="checkbox-caption" for="express-shipping"> - <b>COMPLIMENTARY EXPRESS $19.50</b><br> + <b>COMPLIMENTARY EXPRESS</b><br> (DELIVERY IN 2-4 WORKING DAYS) </label> </div> <div class="checkbox-row"> <div class="checkbox-toggle"> - <input id="standard-shipping" type="radio" name="ShippingType" value="Standard" checked required> + <input id="standard-shipping" type="radio" name="ShippingType" value="Standard" required> <label for="standard-shipping"></label> </div> <label class="checkbox-caption" for="standard-shipping"> - <b>STANDARD SHIPPING $9.50</b><br> + <b>STANDARD SHIPPING</b><br> (DELIVERY IN 5-8 WORKING DAYS) </label> </div> diff --git a/StoneIsland/platforms/android/assets/www/js/lib/account/ProfileView.js b/StoneIsland/platforms/android/assets/www/js/lib/account/ProfileView.js index 2b608cb4..d36f7f38 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/account/ProfileView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/account/ProfileView.js @@ -17,7 +17,6 @@ var ProfileView = FormView.extend({ if (! auth.logged_in()) { return app.router.go("intro") } app.footer.show("SAVE") document.body.className = "profile" - auth.user.DataProfiling2 = auth.user.DataProfiling if (auth.user.BirthDay.match(/T/)) { auth.user.BirthDay = auth.user.BirthDay.split("T")[0] } diff --git a/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js b/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js index 4ef2823f..504827c8 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/auth/LoginView.js @@ -6,6 +6,7 @@ var LoginView = FormView.extend({ events: { "click .newuser": "new_user", + "click .forgotpassword": "forgot_password", "submit form": "save", }, @@ -29,6 +30,10 @@ var LoginView = FormView.extend({ new_user: function(){ app.router.go("account/signup") + }, + + forgot_password: function(){ + window.open("http://www.stoneisland.co.uk/pages/forgotten-password", '_system') }, validate_presence: { diff --git a/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js b/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js index 599f57c7..4645d4d9 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/auth/SignupView.js @@ -15,7 +15,6 @@ var SignupView = FormView.extend({ "Surname": "TestSurname", "BirthDay": "1978-11-12", "DataProfiling": true, - "DataProfiling2": true, }, */ @@ -63,12 +62,10 @@ var SignupView = FormView.extend({ if (data.Email.toLowerCase() !== data.ConfirmEmail.toLowerCase()) { errors.push([ "ConfirmEmail", "Email addresses don't match." ]) } // if (data.Gender === "NONE") { errors.push([ "Gender", "Please supply your gender." ]) } if (data.DataProfiling !== "true") { errors.push([ "DataProfiling", "You must consent to use this service." ]) } - if (data.DataProfiling2 !== "true") { errors.push([ "DataProfiling2", "You must consent to use this service." ]) } data.YooxLetter = this.$("[name=YooxLetter]").prop("checked") }, finalize: function(data){ - delete data.DataProfiling2 delete data.ConfirmEmail data.Gender = "U" diff --git a/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js b/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js index c2a9f4b4..73b7b83b 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/blogs/StoryView.js @@ -26,7 +26,7 @@ var StoryView = ScrollableView.extend({ }, populate: function(data){ - if (this.loaded) {} + if (this.loaded) { return } this.loaded = true this.data = data this.$loader.hide() diff --git a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js b/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js index 1c12e7a1..fc373858 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/nav/NavView.js @@ -115,7 +115,7 @@ var NavView = View.extend({ app.router.go("account/settings") }, return_link: function(){ - window.open("http://www.stoneisland.com/", '_system') + window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system') }, @@ -135,7 +135,7 @@ var NavView = View.extend({ app.router.go("page/terms") }, care: function(){ - window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/return&deviceYeti=smartphone", '_system') + window.open("http://www.stoneisland.com/localize.asp?tskay=4036416C&page=help/home&deviceYeti=smartphone", '_system') }, @@ -146,7 +146,7 @@ var NavView = View.extend({ fb: function(){ - window.open("https://www.facebook.com/StoneIsland", '_system') + window.open(is_ios ? "facebook://profile/231623463406" : "https://www.facebook.com/StoneIsland", '_system') }, insta: function(){ window.open("https://instagram.com/stoneisland_official", '_system') @@ -155,7 +155,6 @@ var NavView = View.extend({ window.open("https://twitter.com/stoneisland", '_system') }, yt: function(){ - console.log("youtube") window.open("https://www.youtube.com/user/StoneIslandOfficial", '_system') }, diff --git a/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js index 4e23ba1f..4e0a5f04 100755 --- a/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js +++ b/StoneIsland/platforms/android/assets/www/js/lib/products/Selector.js @@ -27,13 +27,26 @@ var Selector = View.extend({ this.$el.show() app.curtain.show("white") this.visible = true -// var selectionXY = $("." + origin).offset() -// var selectionWidth = $("." + origin).width() -// var selectorHeight = $('#selector').height() -// console.log(selectionXY.left) -// console.log(selectionXY.top) -// -// $("#selector").css({"top":(selectionXY.top - selectorHeight),"left":selectionXY.left}) + if ( origin == "wide") { + $("#selector").addClass("selector-full") + } + else { + $("#selector").removeClass("selector-full") + } + var originXY = $("." + origin).offset() + var originWidth = $("." + origin).width() + var selectorHeight = $('#selector').height() + var originHeight = $("." + origin).height() + console.log(originXY.left) + console.log(originXY.top) + console.log(selectorHeight) + console.log(origin) + + $("#selector").css({"top":(originXY.top - selectorHeight - originHeight + 20),"left":originXY.left}) + originXY = null; + originWidth = null; + originHeight = null; + selectorHeight = null; }, hide: function(){ diff --git a/StoneIsland/platforms/android/assets/www/js/vendor/util.js b/StoneIsland/platforms/android/assets/www/js/vendor/util.js index e09b6ada..d45c4b98 100755 --- a/StoneIsland/platforms/android/assets/www/js/vendor/util.js +++ b/StoneIsland/platforms/android/assets/www/js/vendor/util.js @@ -173,6 +173,7 @@ var browser = (function( ua ) { // Naive useragent detection pattern var is_iphone = (navigator.userAgent.match(/iPhone/i)) || (navigator.userAgent.match(/iPod/i)) var is_ipad = (navigator.userAgent.match(/iPad/i)) +var is_ios = is_iphone || is_ipad var is_android = (navigator.userAgent.match(/Android/i)) var is_mobile = is_iphone || is_ipad || is_android var is_desktop = ! is_mobile; diff --git a/StoneIsland/platforms/android/libs/Parse-1.9.0.jar b/StoneIsland/platforms/android/libs/Parse-1.9.0.jar Binary files differindex 90ab97cc..90ab97cc 100644..100755 --- a/StoneIsland/platforms/android/libs/Parse-1.9.0.jar +++ b/StoneIsland/platforms/android/libs/Parse-1.9.0.jar diff --git a/StoneIsland/platforms/android/libs/bolts-android-1.1.4.jar b/StoneIsland/platforms/android/libs/bolts-android-1.1.4.jar Binary files differindex d04acb3b..d04acb3b 100644..100755 --- a/StoneIsland/platforms/android/libs/bolts-android-1.1.4.jar +++ b/StoneIsland/platforms/android/libs/bolts-android-1.1.4.jar diff --git a/StoneIsland/platforms/android/platform_www/cordova_plugins.js b/StoneIsland/platforms/android/platform_www/cordova_plugins.js index eec97542..90fa7c51 100755 --- a/StoneIsland/platforms/android/platform_www/cordova_plugins.js +++ b/StoneIsland/platforms/android/platform_www/cordova_plugins.js @@ -9,6 +9,14 @@ module.exports = [ ] }, { + "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", + "id": "com.parse.cordova.core.pushplugin.ParsePlugin", + "pluginId": "com.parse.cordova.core.pushplugin", + "clobbers": [ + "window.parsePlugin" + ] + }, + { "file": "plugins/cordova-plugin-console/www/logger.js", "id": "cordova-plugin-console.logger", "pluginId": "cordova-plugin-console", @@ -111,20 +119,13 @@ module.exports = [ "clobbers": [ "PushNotification" ] - }, - { - "file": "plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js", - "id": "com.parse.cordova.core.pushplugin.ParsePlugin", - "pluginId": "com.parse.cordova.core.pushplugin", - "clobbers": [ - "window.parsePlugin" - ] } ]; module.exports.metadata = // TOP OF METADATA { "com.ionic.keyboard": "1.0.4", + "com.parse.cordova.core.pushplugin": "0.1.0", "cordova-plugin-console": "1.0.1", "cordova-plugin-customurlscheme": "4.0.0", "cordova-plugin-device": "1.0.1", @@ -135,8 +136,7 @@ module.exports.metadata = "cordova-plugin-splashscreen": "2.1.0", "cordova-plugin-whitelist": "1.0.0", "cordova-plugin-x-socialsharing": "5.0.7", - "phonegap-plugin-push": "1.4.4", - "com.parse.cordova.core.pushplugin": "0.1.0" + "phonegap-plugin-push": "1.4.4" } // BOTTOM OF METADATA });
\ No newline at end of file diff --git a/StoneIsland/platforms/android/platform_www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js b/StoneIsland/platforms/android/platform_www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js index e732f80d..e732f80d 100644..100755 --- a/StoneIsland/platforms/android/platform_www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js +++ b/StoneIsland/platforms/android/platform_www/plugins/com.parse.cordova.core.pushplugin/www/cdv-plugin-parse.js diff --git a/StoneIsland/platforms/android/res/values/parseplugin.xml b/StoneIsland/platforms/android/res/values/parseplugin.xml index 771d375e..771d375e 100644..100755 --- a/StoneIsland/platforms/android/res/values/parseplugin.xml +++ b/StoneIsland/platforms/android/res/values/parseplugin.xml diff --git a/StoneIsland/platforms/android/res/xml/config.xml b/StoneIsland/platforms/android/res/xml/config.xml index cdcf29d8..7bcd705b 100755 --- a/StoneIsland/platforms/android/res/xml/config.xml +++ b/StoneIsland/platforms/android/res/xml/config.xml @@ -1,10 +1,13 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.4.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="us.okfoc.stoneisland" version="0.4.4" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <preference name="loglevel" value="DEBUG" /> <feature name="Keyboard"> <param name="android-package" value="com.ionic.keyboard.IonicKeyboard" /> <param name="onload" value="true" /> </feature> + <feature name="ParsePlugin"> + <param name="android-package" value="org.apache.cordova.core.ParsePlugin" /> + </feature> <feature name="LaunchMyApp"> <param name="android-package" value="nl.xservices.plugins.LaunchMyApp" /> </feature> @@ -34,9 +37,6 @@ <feature name="PushNotification"> <param name="android-package" value="com.adobe.phonegap.push.PushPlugin" /> </feature> - <feature name="ParsePlugin"> - <param name="android-package" value="org.apache.cordova.core.ParsePlugin" /> - </feature> <allow-intent href="market:*" /> <preference name="AndroidLaunchMode" value="singleTop" /> <preference name="android-minSdkVersion" value="21" /> diff --git a/StoneIsland/platforms/android/src/org/apache/cordova/core/ParsePlugin.java b/StoneIsland/platforms/android/src/org/apache/cordova/core/ParsePlugin.java index 0ae772be..0ae772be 100644..100755 --- a/StoneIsland/platforms/android/src/org/apache/cordova/core/ParsePlugin.java +++ b/StoneIsland/platforms/android/src/org/apache/cordova/core/ParsePlugin.java diff --git a/StoneIsland/platforms/android/src/org/apache/cordova/core/ParsePluginReceiver.java b/StoneIsland/platforms/android/src/org/apache/cordova/core/ParsePluginReceiver.java index fa917a48..fa917a48 100644..100755 --- a/StoneIsland/platforms/android/src/org/apache/cordova/core/ParsePluginReceiver.java +++ b/StoneIsland/platforms/android/src/org/apache/cordova/core/ParsePluginReceiver.java diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index bb0ee5a8..fc7c7cd3 100755 --- a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist +++ b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist @@ -57,7 +57,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.4.3</string> + <string>0.5.0</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -70,7 +70,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.4.3</string> + <string>0.5.0</string> <key>LSApplicationQueriesSchemes</key> <array> <string>youtube</string> diff --git a/StoneIsland/platforms/ios/Stone Island/config.xml b/StoneIsland/platforms/ios/Stone Island/config.xml index d0090f12..c52b46e5 100755 --- a/StoneIsland/platforms/ios/Stone Island/config.xml +++ b/StoneIsland/platforms/ios/Stone Island/config.xml @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='utf-8'?> -<widget id="us.okfoc.stoneisland" version="0.4.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> +<widget id="us.okfoc.stoneisland" version="0.5.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <preference name="AllowInlineMediaPlayback" value="false" /> <preference name="BackupWebStorage" value="cloud" /> <preference name="DisallowOverscroll" value="false" /> @@ -77,4 +77,5 @@ <preference name="StatusBarOverlaysWebView" value="false" /> <preference name="StatusBarBackgroundColor" value="#000000" /> <preference name="StatusBarStyle" value="lightcontent" /> + <preference name="SplashMaintainAspectRatio" value="true" /> </widget> diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index d96073e4..b77cd428 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -295,13 +295,17 @@ input.switch:checked + label:after { } .container-fill { - min-height:50px; + min-height:80px; flex: 1; align-items: center; justify-content: center; position:relative; } +.container-fill-condensed { + min-height:38px!important; +} + .container-row .container-message { color:#000; text-align:center; @@ -309,9 +313,11 @@ input.switch:checked + label:after { box-sizing:border-box; margin:10px auto 0; position:relative - } +.container-row .container-message-condensed { + margin: 2px auto!important +} .container-fill .container-message { font-size:12px; letter-spacing:0.5px; @@ -347,15 +353,19 @@ input.switch:checked + label:after { margin:0 auto; } +#signup .checkbox-container { + margin-top:12px!important +} + .checkbox-toggle { display:table-cell; box-sizing:border-box; - padding-right:15px; + padding-right:0px; position:relative; } .checkbox-toggle input { - width: 50px; + width: 45px; height: 35px; opacity: 0; z-index: 99999; @@ -509,11 +519,11 @@ margin-bottom:9px!important .newuser { display:inline-block; - padding:20px; + padding:14px; text-decoration:underline } .forgotpassword { - padding:20px; + padding:14px; text-decoration:underline }
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/css/cart.css b/StoneIsland/platforms/ios/www/css/cart.css index 9fbc54b3..5c910eb4 100755 --- a/StoneIsland/platforms/ios/www/css/cart.css +++ b/StoneIsland/platforms/ios/www/css/cart.css @@ -355,4 +355,8 @@ color:#000; #cart_shipping .half-input input { margin-top:0px +} + +#cart .scroll, #payment .scroll, #shipping .scroll, #signup .scroll { + min-height:calc(100% + 100px) }
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/css/nav.css b/StoneIsland/platforms/ios/www/css/nav.css index 832ec46a..05e4aedc 100755 --- a/StoneIsland/platforms/ios/www/css/nav.css +++ b/StoneIsland/platforms/ios/www/css/nav.css @@ -395,6 +395,10 @@ h1 { } .msg { - padding: 20px; + margin: 20px; display: inline-block; } + +.msg-condensed { + margin:6px!important; +} diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index 4058403c..b9dd0a91 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -360,28 +360,18 @@ <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required> <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required> </div> - <div class="container-row"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> - - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-signup" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-signup"></label> - </div> - </div> <div class="container-row"> - <div class="checkbox-container"> + <div class="checkbox-container "> + <div class="checkbox-row"> + <div class="checkbox-toggle"> + <input type="checkbox" id="checkbox-data-profiling" name="DataProfiling" value="true" required> + <label for="checkbox-data-profiling"></label> + </div> + <label class="checkbox-caption" for="checkbox-data-profiling"> + I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions). + </label> + </div> <div class="checkbox-row"> <div class="checkbox-toggle"> <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required> @@ -418,20 +408,26 @@ <h2>CHANGE PASSWORD</h2> <input type="password" name="CurrentPassword" placeholder="CURRENT PASSWORD" required> <input type="password" name="NewPassword" placeholder="NEW PASSWORD (7 CHARACTERS OR MORE)" required> - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-profile"></label> + <div class="container-fill container-fill-condensed"> + <div class="container-message container-message-condensed"> + <span class="msg msg-condensed"> + </span> </div> </div> <div class="container-row"> <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> + <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required> + <label for="receive-newsletter-profile"></label> + </div> + <label class="checkbox-caption" for="receive-newsletter-profile"> + <b>Newsletter</b><br> + Receive Stone Island Newsletter + </label> + </div> + <div class="checkbox-row"> + <div class="checkbox-toggle"> <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required> <label for="checkbox-shopping-data-profiling-profile"></label> </div> @@ -445,14 +441,6 @@ </div> </div> </div> - <div class="container-fill"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> </div> </form> </div> diff --git a/StoneIsland/platforms/ios/www/js/index.js b/StoneIsland/platforms/ios/www/js/index.js index 050a729c..73af443a 100755 --- a/StoneIsland/platforms/ios/www/js/index.js +++ b/StoneIsland/platforms/ios/www/js/index.js @@ -3,7 +3,7 @@ var app = (function(){ app.init = function(){ - sdk.init({ env: "production" }) + sdk.init({ env: "test" }) app.bind() app.build() diff --git a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js index dae7f98d..4ed05bb8 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/HubView.js @@ -25,13 +25,22 @@ var HubView = ScrollableView.extend({ galleries: {}, populate: function(data){ - this.data = data + // sort posts by date, reversed + this.data = data.map(function(s){ + return [ +moment(s.date), s ] + }).sort(function(a,b){ + return a[0] > b[0] ? -1 : a[0] == b[0] ? 0 : 1 + }).map(function(pair){ + console.log(pair[1]) + return pair[1] + }) this.$loader.hide() this.$content.empty() this.galleries = {} // id date subtitle body link store image[uri caption] this.data.forEach(function(row){ // console.log(row) + console.log(moment(row.date)) var t = this.template.replace(/{{id}}/g, row.id) .replace(/{{date}}/, moment(row.date).format("MM.DD.YYYY")) .replace(/{{title}}/, row.title) diff --git a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js index fac34c1e..88521bb1 100755 --- a/StoneIsland/platforms/ios/www/js/lib/etc/geo.js +++ b/StoneIsland/platforms/ios/www/js/lib/etc/geo.js @@ -1,23 +1,49 @@ var geo = (function(){ var geo = {} + var polling = false, fetching = false, poll_timeout = null + geo.fetch = function(){ + fetching = true navigator.geolocation.getCurrentPosition(geo.success, geo.error, {timeout: 15000}) } geo.success = function(position){ - var lat_str = as_degrees( position.coords.latitude || 40.99167 ) - var lng_str = as_degrees( position.coords.longitude || -74.07944 ) + var lat_str = as_degrees( position.coords.latitude || 40.99167, "N", "S" ) + var lng_str = as_degrees( position.coords.longitude || -74.07944, "W", "E" ) $(".latlng").html( lat_str + " " + lng_str ) + geo.done() } geo.error = function(error){ - $(".latlng").html( "+40° 58' 90\" -74° 04' 46\"" ) + $(".latlng").html( "+40° 58' 90.9\" N 74° 04' 46.3\" W" ) + geo.done() + } + + geo.done = function(){ + fetching = false + if (polling) { + clearTimeout( poll_timeout ) + poll_timeout = setTimeout(geo.fetch, 15000) + } + } + + geo.start_polling = function(){ + polling = true + if (! fetching) { + geo.fetch() + } + } + + geo.stop_polling = function(){ + polling = false + clearTimeout(poll_timeout) } - function as_degrees (n) { + function as_degrees (n, pos, neg) { var s = "" - if (n >= 0) s += "+" + var sig = n >= 0 ? pos : neg + s += Math.floor(n) + "° " n = Math.abs(n) @@ -31,7 +57,13 @@ var geo = (function(){ n *= 60 nn = Math.floor(n) if (nn < 10) nn = "0" + nn - s += nn + '"' + s += nn + + n %= 1 + n *= 10 + nn = Math.floor(n) + s += "." + nn + '\" ' + sig + return s } diff --git a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js index 5e5ea908..c075619a 100755 --- a/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js +++ b/StoneIsland/platforms/ios/www/js/lib/nav/IntroView.js @@ -21,14 +21,13 @@ var IntroView = View.extend({ window.addEventListener("deviceorientation", this.orient) app.footer.hide() this.orient({ alpha: 0 }) - // get location.. }, - + hide: function(){ window.removeEventListener("deviceorientation", this.orient) this.$alert.hide() }, - + deviceorientation: function(e){ var heading if ('webkitCompassHeading' in e) { @@ -61,5 +60,5 @@ var IntroView = View.extend({ e.stopPropagation() app.router.go("archive") }, - + }) diff --git a/StoneIsland/plugins/android.json b/StoneIsland/plugins/android.json index e9e9ecdb..8747af08 100755 --- a/StoneIsland/plugins/android.json +++ b/StoneIsland/plugins/android.json @@ -10,6 +10,11 @@ "com.ionic.keyboard": { "PACKAGE_NAME": "us.okfoc.stoneisland" }, + "com.parse.cordova.core.pushplugin": { + "APP_ID": "GS82ZxpN8Mecpc53rsyu6aLLGK0W4CKi42J25DLB", + "CLIENT_KEY": "hQRtQfsgimYnX5PMivtcdXCG9eZhESeyTr0Rd8Sv", + "PACKAGE_NAME": "us.okfoc.stoneisland" + }, "cordova-plugin-console": { "PACKAGE_NAME": "us.okfoc.stoneisland" }, @@ -43,11 +48,6 @@ }, "phonegap-plugin-push": { "PACKAGE_NAME": "us.okfoc.stoneisland" - }, - "com.parse.cordova.core.pushplugin": { - "APP_ID": "GS82ZxpN8Mecpc53rsyu6aLLGK0W4CKi42J25DLB", - "CLIENT_KEY": "hQRtQfsgimYnX5PMivtcdXCG9eZhESeyTr0Rd8Sv", - "PACKAGE_NAME": "us.okfoc.stoneisland" } }, "dependent_plugins": {} diff --git a/StoneIsland/www/css/account.css b/StoneIsland/www/css/account.css index d96073e4..b77cd428 100755 --- a/StoneIsland/www/css/account.css +++ b/StoneIsland/www/css/account.css @@ -295,13 +295,17 @@ input.switch:checked + label:after { } .container-fill { - min-height:50px; + min-height:80px; flex: 1; align-items: center; justify-content: center; position:relative; } +.container-fill-condensed { + min-height:38px!important; +} + .container-row .container-message { color:#000; text-align:center; @@ -309,9 +313,11 @@ input.switch:checked + label:after { box-sizing:border-box; margin:10px auto 0; position:relative - } +.container-row .container-message-condensed { + margin: 2px auto!important +} .container-fill .container-message { font-size:12px; letter-spacing:0.5px; @@ -347,15 +353,19 @@ input.switch:checked + label:after { margin:0 auto; } +#signup .checkbox-container { + margin-top:12px!important +} + .checkbox-toggle { display:table-cell; box-sizing:border-box; - padding-right:15px; + padding-right:0px; position:relative; } .checkbox-toggle input { - width: 50px; + width: 45px; height: 35px; opacity: 0; z-index: 99999; @@ -509,11 +519,11 @@ margin-bottom:9px!important .newuser { display:inline-block; - padding:20px; + padding:14px; text-decoration:underline } .forgotpassword { - padding:20px; + padding:14px; text-decoration:underline }
\ No newline at end of file diff --git a/StoneIsland/www/css/cart.css b/StoneIsland/www/css/cart.css index 9fbc54b3..5c910eb4 100755 --- a/StoneIsland/www/css/cart.css +++ b/StoneIsland/www/css/cart.css @@ -355,4 +355,8 @@ color:#000; #cart_shipping .half-input input { margin-top:0px +} + +#cart .scroll, #payment .scroll, #shipping .scroll, #signup .scroll { + min-height:calc(100% + 100px) }
\ No newline at end of file diff --git a/StoneIsland/www/css/nav.css b/StoneIsland/www/css/nav.css index 832ec46a..05e4aedc 100755 --- a/StoneIsland/www/css/nav.css +++ b/StoneIsland/www/css/nav.css @@ -395,6 +395,10 @@ h1 { } .msg { - padding: 20px; + margin: 20px; display: inline-block; } + +.msg-condensed { + margin:6px!important; +} diff --git a/StoneIsland/www/index.html b/StoneIsland/www/index.html index 4058403c..b9dd0a91 100755 --- a/StoneIsland/www/index.html +++ b/StoneIsland/www/index.html @@ -360,28 +360,18 @@ <input type="password" name="Password" placeholder="PASSWORD (7 CHARACTERS OR MORE)" required> <input type="password" name="Password2" placeholder="CONFIRM PASSWORD" required> </div> - <div class="container-row"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> - - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-signup" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-signup"></label> - </div> - </div> <div class="container-row"> - <div class="checkbox-container"> + <div class="checkbox-container "> + <div class="checkbox-row"> + <div class="checkbox-toggle"> + <input type="checkbox" id="checkbox-data-profiling" name="DataProfiling" value="true" required> + <label for="checkbox-data-profiling"></label> + </div> + <label class="checkbox-caption" for="checkbox-data-profiling"> + I agree that YOOX and SPORTSWEAR COMPANY may collect my personal information for marketing purposes (newsletters, news and promotions). + </label> + </div> <div class="checkbox-row"> <div class="checkbox-toggle"> <input type="checkbox" id="checkbox-shopping-data-profiling" name="DataProfiling" value="true" required> @@ -418,20 +408,26 @@ <h2>CHANGE PASSWORD</h2> <input type="password" name="CurrentPassword" placeholder="CURRENT PASSWORD" required> <input type="password" name="NewPassword" placeholder="NEW PASSWORD (7 CHARACTERS OR MORE)" required> - <div class="toggle-container"> - <div class="caption"> - <h3>Newsletter</h3> - Receive Stone Island Newsletter - </div> - <div class="toggle"> - <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" class="switch" value="true"> - <label for="receive-newsletter-profile"></label> + <div class="container-fill container-fill-condensed"> + <div class="container-message container-message-condensed"> + <span class="msg msg-condensed"> + </span> </div> </div> <div class="container-row"> <div class="checkbox-container"> <div class="checkbox-row"> <div class="checkbox-toggle"> + <input type="checkbox" id="receive-newsletter-profile" name="YooxLetter" value="true" required> + <label for="receive-newsletter-profile"></label> + </div> + <label class="checkbox-caption" for="receive-newsletter-profile"> + <b>Newsletter</b><br> + Receive Stone Island Newsletter + </label> + </div> + <div class="checkbox-row"> + <div class="checkbox-toggle"> <input type="checkbox" id="checkbox-shopping-data-profiling-profile" name="DataProfiling" value="true" required> <label for="checkbox-shopping-data-profiling-profile"></label> </div> @@ -445,14 +441,6 @@ </div> </div> </div> - <div class="container-fill"> - <div class="container-message"> - <span class="msg"> - * Your personal and payment<br> - information will always remain private - </span> - </div> - </div> </div> </form> </div> diff --git a/StoneIsland/www/js/index.js b/StoneIsland/www/js/index.js index 050a729c..73af443a 100755 --- a/StoneIsland/www/js/index.js +++ b/StoneIsland/www/js/index.js @@ -3,7 +3,7 @@ var app = (function(){ app.init = function(){ - sdk.init({ env: "production" }) + sdk.init({ env: "test" }) app.bind() app.build() diff --git a/StoneIsland/www/js/lib/blogs/HubView.js b/StoneIsland/www/js/lib/blogs/HubView.js index dae7f98d..4ed05bb8 100755 --- a/StoneIsland/www/js/lib/blogs/HubView.js +++ b/StoneIsland/www/js/lib/blogs/HubView.js @@ -25,13 +25,22 @@ var HubView = ScrollableView.extend({ galleries: {}, populate: function(data){ - this.data = data + // sort posts by date, reversed + this.data = data.map(function(s){ + return [ +moment(s.date), s ] + }).sort(function(a,b){ + return a[0] > b[0] ? -1 : a[0] == b[0] ? 0 : 1 + }).map(function(pair){ + console.log(pair[1]) + return pair[1] + }) this.$loader.hide() this.$content.empty() this.galleries = {} // id date subtitle body link store image[uri caption] this.data.forEach(function(row){ // console.log(row) + console.log(moment(row.date)) var t = this.template.replace(/{{id}}/g, row.id) .replace(/{{date}}/, moment(row.date).format("MM.DD.YYYY")) .replace(/{{title}}/, row.title) diff --git a/StoneIsland/www/js/lib/etc/geo.js b/StoneIsland/www/js/lib/etc/geo.js index fac34c1e..88521bb1 100755 --- a/StoneIsland/www/js/lib/etc/geo.js +++ b/StoneIsland/www/js/lib/etc/geo.js @@ -1,23 +1,49 @@ var geo = (function(){ var geo = {} + var polling = false, fetching = false, poll_timeout = null + geo.fetch = function(){ + fetching = true navigator.geolocation.getCurrentPosition(geo.success, geo.error, {timeout: 15000}) } geo.success = function(position){ - var lat_str = as_degrees( position.coords.latitude || 40.99167 ) - var lng_str = as_degrees( position.coords.longitude || -74.07944 ) + var lat_str = as_degrees( position.coords.latitude || 40.99167, "N", "S" ) + var lng_str = as_degrees( position.coords.longitude || -74.07944, "W", "E" ) $(".latlng").html( lat_str + " " + lng_str ) + geo.done() } geo.error = function(error){ - $(".latlng").html( "+40° 58' 90\" -74° 04' 46\"" ) + $(".latlng").html( "+40° 58' 90.9\" N 74° 04' 46.3\" W" ) + geo.done() + } + + geo.done = function(){ + fetching = false + if (polling) { + clearTimeout( poll_timeout ) + poll_timeout = setTimeout(geo.fetch, 15000) + } + } + + geo.start_polling = function(){ + polling = true + if (! fetching) { + geo.fetch() + } + } + + geo.stop_polling = function(){ + polling = false + clearTimeout(poll_timeout) } - function as_degrees (n) { + function as_degrees (n, pos, neg) { var s = "" - if (n >= 0) s += "+" + var sig = n >= 0 ? pos : neg + s += Math.floor(n) + "° " n = Math.abs(n) @@ -31,7 +57,13 @@ var geo = (function(){ n *= 60 nn = Math.floor(n) if (nn < 10) nn = "0" + nn - s += nn + '"' + s += nn + + n %= 1 + n *= 10 + nn = Math.floor(n) + s += "." + nn + '\" ' + sig + return s } diff --git a/StoneIsland/www/js/lib/nav/IntroView.js b/StoneIsland/www/js/lib/nav/IntroView.js index 5e5ea908..c075619a 100755 --- a/StoneIsland/www/js/lib/nav/IntroView.js +++ b/StoneIsland/www/js/lib/nav/IntroView.js @@ -21,14 +21,13 @@ var IntroView = View.extend({ window.addEventListener("deviceorientation", this.orient) app.footer.hide() this.orient({ alpha: 0 }) - // get location.. }, - + hide: function(){ window.removeEventListener("deviceorientation", this.orient) this.$alert.hide() }, - + deviceorientation: function(e){ var heading if ('webkitCompassHeading' in e) { @@ -61,5 +60,5 @@ var IntroView = View.extend({ e.stopPropagation() app.router.go("archive") }, - + }) |