Improvements for mobile layouts and mobile and iPad browser detection.

2024-11-23 23:58:02 -05:00 · 2014-11-30 12:27:34 -08:00 · 2014-11-30 12:27:34 -08:00 · 77a4cea387
commit 77a4cea387
parent 066b1798ab
7 changed files with 19 additions and 5 deletions
--- a/app/assets/main.html
+++ b/app/assets/main.html
@ -6,7 +6,7 @@
 <!--[if !IE]><!--><html lang="en"> <!--<![endif]-->
 <head>
  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width,initial-scale=1">
+  <meta name="viewport" content="width=1024">

  <title>CodeCombat - Learn how to code by playing a game</title>
  <meta name="description" content="Learn programming with a multiplayer live coding strategy game for beginners. Learn Python or JavaScript as you defeat ogres, solve mazes, and level up. Free, open source HTML5 game!">
--- a/app/locale/en.coffee
+++ b/app/locale/en.coffee
@ -6,6 +6,7 @@
    play: "Play"  # The big play button that just starts playing a level
    old_browser: "Uh oh, your browser is too old to run CodeCombat. Sorry!"  # Warning that shows up on really old Firefox/Chrome/Safari
    old_browser_suffix: "You can try anyway, but it probably won't work."
+    ipad_browser: "Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval."
    campaign: "Campaign"
    for_beginners: "For Beginners"
    multiplayer: "Multiplayer"  # Not currently shown on home page
--- a/app/styles/common/site-chrome.sass
+++ b/app/styles/common/site-chrome.sass
@ -32,7 +32,11 @@
    
    @media screen and ( max-height: 800px )
      top: -80px
-      
+
+    @media screen and ( max-width: 1024px )
+      .multiplayer-nav-link
+        display: none
+
    #nav-logo
      position: absolute
      margin-right: auto
--- a/app/templates/base.jade
+++ b/app/templates/base.jade
@ -8,7 +8,7 @@ block header
      a(href="/")
        span.glyphicon.glyphicon-home
      a(href="/about", data-i18n="nav.about")
-      a(href='/play/ladder', data-i18n="home.multiplayer")
+      a(href='/play/ladder', data-i18n="home.multiplayer").multiplayer-nav-link
      a(href='/community', data-i18n="nav.community")
      a(href='http://blog.codecombat.com/', data-i18n="nav.blog")
      a(href='http://discourse.codecombat.com/', data-i18n="nav.forum")
--- a/app/templates/home-view.jade
+++ b/app/templates/home-view.jade
@ -17,11 +17,14 @@ block outer_content
  if isMobile
    .alert.alert-danger.mobile
      strong(data-i18n="home.no_mobile") CodeCombat wasn't designed for mobile devices and may not work!
-  if isOldBrowser
+  else if isOldBrowser
    .alert.alert-danger.old-browser
      strong(data-i18n="home.old_browser") Uh oh, your browser is too old to run CodeCombat. Sorry!
      br
      span(data-i18n="home.old_browser_suffix") You can try anyway, but it probably won't work.
+  else if isIPadBrowser
+    .alert.alert-danger.ipad-browser
+      strong(data-i18n="home.ipad_browser") Bad news: CodeCombat doesn't run on iPad in the browser. Good news: our native iPad app is awaiting Apple approval.

 block extra_footer_content
  if true || explainHourOfCode
--- a/app/views/HomeView.coffee
+++ b/app/views/HomeView.coffee
@ -30,6 +30,8 @@ module.exports = class HomeView extends RootView
    c.isEnglish = (me.get('preferredLanguage') or 'en').startsWith 'en'
    c.languageName = me.get('preferredLanguage')
    c.explainsHourOfCode = @explainsHourOfCode
+    c.isMobile = @isMobile()
+    c.isIPadBrowser = @isIPadBrowser()
    c

  onClickBeginnerCampaign: (e) ->
--- a/app/views/core/CocoView.coffee
+++ b/app/views/core/CocoView.coffee
@ -405,6 +405,9 @@ module.exports = class CocoView extends Backbone.View
    return @_isIPadApp if @_isIPadApp?
    return @_isIPadApp = webkit?.messageHandlers? and navigator.userAgent?.indexOf('iPad') isnt -1

+  isIPadBrowser: ->
+    navigator?.userAgent?.indexOf('iPad') isnt -1
+
  initSlider: ($el, startValue, changeCallback) ->
    slider = $el.slider({animate: 'fast'})
    slider.slider('value', startValue)
@ -442,7 +445,8 @@ module.exports = class CocoView extends Backbone.View
  playSound: (trigger, volume=1) ->
    Backbone.Mediator.publish 'audio-player:play-sound', trigger: trigger, volume: volume

-  mobileRELong = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows (ce|phone)|xda|xiino/i
+mobileRELong = /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i
+
 mobileREShort = /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i

 module.exports = CocoView