diff options
| -rwxr-xr-x | StoneIsland/config.xml | 2 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate | bin | 41602 -> 41967 bytes | |||
| -rwxr-xr-x | StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist | 4 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/Stone Island/config.xml | 2 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/css/account.css | 11 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/index.html | 3 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js | 5 | ||||
| -rwxr-xr-x | StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js | 1 | ||||
| -rwxr-xr-x | StoneIsland/www/js/lib/blogs/ArchiveView.js | 1 |
9 files changed, 24 insertions, 5 deletions
diff --git a/StoneIsland/config.xml b/StoneIsland/config.xml index 35708e80..967c4d41 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.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.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <name>Stone Island</name> <description> Stone Island diff --git a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate Binary files differindex 92f36f53..67b972ba 100755 --- a/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate +++ b/StoneIsland/platforms/ios/Stone Island.xcodeproj/project.xcworkspace/xcuserdata/user.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist b/StoneIsland/platforms/ios/Stone Island/Stone Island-Info.plist index 203752b1..bb0ee5a8 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.1</string> + <string>0.4.3</string> <key>CFBundleSignature</key> <string>????</string> <key>CFBundleURLTypes</key> @@ -70,7 +70,7 @@ </dict> </array> <key>CFBundleVersion</key> - <string>0.4.1</string> + <string>0.4.3</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 9af7f246..d0090f12 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.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.3" 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" /> diff --git a/StoneIsland/platforms/ios/www/css/account.css b/StoneIsland/platforms/ios/www/css/account.css index fd5ffdf6..d96073e4 100755 --- a/StoneIsland/platforms/ios/www/css/account.css +++ b/StoneIsland/platforms/ios/www/css/account.css @@ -505,4 +505,15 @@ margin-top:0px #login .container-row input:first-child { margin-bottom:9px!important +} + +.newuser { + display:inline-block; + padding:20px; + text-decoration:underline +} + +.forgotpassword { + padding:20px; + text-decoration:underline }
\ No newline at end of file diff --git a/StoneIsland/platforms/ios/www/index.html b/StoneIsland/platforms/ios/www/index.html index d6581b76..4058403c 100755 --- a/StoneIsland/platforms/ios/www/index.html +++ b/StoneIsland/platforms/ios/www/index.html @@ -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> diff --git a/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js b/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js index 4ef2823f..504827c8 100755 --- a/StoneIsland/platforms/ios/www/js/lib/auth/LoginView.js +++ b/StoneIsland/platforms/ios/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/ios/www/js/lib/blogs/ArchiveView.js b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js index 5a036930..e7211036 100755 --- a/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js +++ b/StoneIsland/platforms/ios/www/js/lib/blogs/ArchiveView.js @@ -36,6 +36,7 @@ var ArchiveView = ScrollableView.extend({ var index = $(e.currentTarget).data("index") this.$subtitle.html( $(e.currentTarget).text() ) this.populateDecade(index) + this.deferScrollToTop() }, show: function(){ diff --git a/StoneIsland/www/js/lib/blogs/ArchiveView.js b/StoneIsland/www/js/lib/blogs/ArchiveView.js index 5a036930..e7211036 100755 --- a/StoneIsland/www/js/lib/blogs/ArchiveView.js +++ b/StoneIsland/www/js/lib/blogs/ArchiveView.js @@ -36,6 +36,7 @@ var ArchiveView = ScrollableView.extend({ var index = $(e.currentTarget).data("index") this.$subtitle.html( $(e.currentTarget).text() ) this.populateDecade(index) + this.deferScrollToTop() }, show: function(){ |
