Merge branch 'master' into production

app/locale/en.coffee

@@ -111,8 +111,6 @@
     signup_switch: "Want to create an account?"
 
   signup:
-    create_account_title: "Create Account to Save Progress"
-    description: "It's free. Just need a couple things and you'll be good to go:"
     email_announcements: "Receive announcements by email"
     creating: "Creating Account..."
     sign_up: "Sign Up"
@@ -337,7 +335,8 @@
 
   subscribe:
     subscribe_title: "Subscribe"
-    levels: "Unlock 17 extra levels! With 5 new ones every week!"
+    unsubscribe: "Unsubscribe"
+    levels: "Get more practice with bonus levels!"
     heroes: "More powerful heroes!"
     gems: "3500 bonus gems every month!"
     items: "Over 250 bonus items!"

app/locale/uk.coffee

@@ -495,7 +495,7 @@ module.exports = nativeDescription: "Українська", englishDescription:
     email_any_notes_description: "Вимкніть аби заборонити сповіщення на email."
     email_news: "Новини"
     email_recruit_notes: "Ваканція роботи"
-#    email_recruit_notes_description: "If you play really well, we may contact you about getting you a (better) job."
+    email_recruit_notes_description: "Якщо ти граеш дуже добре, ми можемо запропонувати тобі (кращу) роботу."
     contributor_emails: "Підписки за класами учасників"
     contribute_prefix: "Нам потрібні люди, які приєднаються до нашої команди! Зайдіть на "
     contribute_page: "сторінку учасників,"
@@ -725,15 +725,15 @@ module.exports = nativeDescription: "Українська", englishDescription:
     helpful_ambassadors: "Наші незамінні Посланці:"
 
   ladder:
-#    please_login: "Please log in first before playing a ladder game."
+    please_login: "Будь ласка увійдіть до вашого акаунта перед грою у драбині."
     my_matches: "Мої поєдинки"
-#    simulate: "Simulate"
+    simulate: "Моделювати"
-#    simulation_explanation: "By simulating games you can get your game ranked faster!"
+    simulation_explanation: "Моделюючи ігри ви можете швидше отримати оцінку вашої гри!"
-#    simulate_games: "Simulate Games!"
+    simulate_games: "Моделювати ігри!"
-#    simulate_all: "RESET AND SIMULATE GAMES"
+    simulate_all: "ЗБРОСИТИ ТА МОДЕЛЮВАТИ ІГРИ"
-#    games_simulated_by: "Games simulated by you:"
+    games_simulated_by: "Ігор модельовано вами:"
-#    games_simulated_for: "Games simulated for you:"
+    games_simulated_for: "Ігор модельовано для вас:"
-#    games_simulated: "Games simulated"
+    games_simulated: "Ігор модельовано"
     games_played: "Ігор зіграно"
     ratio: "Співвідношення"
     leaderboard: "Таблиця лідерів"
@@ -742,40 +742,40 @@ module.exports = nativeDescription: "Українська", englishDescription:
     summary_matches: "Поєдинки - "
     summary_wins: " Перемоги, "
     summary_losses: " Поразки"
-#    rank_no_code: "No New Code to Rank"
+    rank_no_code: "Нема нового коду для оцінки"
-#    rank_my_game: "Rank My Game!"
+    rank_my_game: "Оцінити мою гру!"
     rank_submitting: "Відправлення..."
-#    rank_submitted: "Submitted for Ranking"
+    rank_submitted: "Відправлено для оцінки"
-#    rank_failed: "Failed to Rank"
+    rank_failed: "Не вдалося оцінити"
-#    rank_being_ranked: "Game Being Ranked"
+    rank_being_ranked: "Гра оцінюється"
-#    rank_last_submitted: "submitted "
+    rank_last_submitted: "відправлено "
-#    help_simulate: "Help simulate games?"
+    help_simulate: "Допомогти моделювати ігри?"
-#    code_being_simulated: "Your new code is being simulated by other players for ranking. This will refresh as new matches come in."
+    code_being_simulated: "Ваш новий код моделюється іншими гравцями для оцінки. Буде обновлюватися із новими матчами."
-#    no_ranked_matches_pre: "No ranked matches for the "
+    no_ranked_matches_pre: "Немає нових матчей для "
-#    no_ranked_matches_post: " team! Play against some competitors and then come back here to get your game ranked."
+    no_ranked_matches_post: " команди! Зіграйте проти супротивників та поверніться для отримання оцінки вашої гри."
     choose_opponent: "Оберіть противника"
     select_your_language: "Оберіть мову!"
-#    tutorial_play: "Play Tutorial"
+    tutorial_play: "Пройти навчання"
     tutorial_recommended: "Рекомендовано, якщо ви взагалі раніше не грали"
-#    tutorial_skip: "Skip Tutorial"
+    tutorial_skip: "Пропустити навчання"
-#    tutorial_not_sure: "Not sure what's going on?"
+    tutorial_not_sure: "Не впевнені що відбувається?"
-#    tutorial_play_first: "Play the Tutorial first."
+    tutorial_play_first: "Спочатку пройти навчання."
     simple_ai: "Простий ШІ"
-#    warmup: "Warmup"
+    warmup: "Розігрів"
-#    friends_playing: "Friends Playing"
+    friends_playing: "Дружня гра"
-#    log_in_for_friends: "Log in to play with your friends!"
+    log_in_for_friends: "Увійдіть та грайте за вашими друзями!"
-#    social_connect_blurb: "Connect and play against your friends!"
+    social_connect_blurb: "Приєднайтесь та грайте проти ваших друзів!"
-#    invite_friends_to_battle: "Invite your friends to join you in battle!"
+    invite_friends_to_battle: "Завітайте ваших друзів приєднатися до вас у бою!"
     fight: "В бій!"
-#    watch_victory: "Watch your victory"
+    watch_victory: "Подивитись вашу перемогу"
-#    defeat_the: "Defeat the"
+    defeat_the: "Перемогти"
-#    tournament_ends: "Tournament ends"
+    tournament_ends: "Турнір завершуються"
-#    tournament_ended: "Tournament ended"
+    tournament_ended: "Турнір завершено"
-#    tournament_rules: "Tournament Rules"
+    tournament_rules: "Правила турніру"
 #    tournament_blurb: "Write code, collect gold, build armies, crush foes, win prizes, and upgrade your career in our $40,000 Greed tournament! Check out the details"
 #    tournament_blurb_criss_cross: "Win bids, construct paths, outwit opponents, grab gems, and upgrade your career in our Criss-Cross tournament! Check out the details"
-#    tournament_blurb_blog: "on our blog"
+    tournament_blurb_blog: "у нашому блозі"
-#    rules: "Rules"
+    rules: "Правила"
     winners: "Переможці"
 
   user:

app/styles/play/modal/buy-gems-modal.sass

@@ -25,10 +25,11 @@
     
     .product
       width: 228px
-      overflow: none
+      height: 136px
       float: left
       text-align: center
       margin-right: 12px
+      position: relative
       
       h4
         font-size: 20px
@@ -40,7 +41,10 @@
         color: rgb(22,16,5)
         
       button
+        position: absolute
         width: 80%
+        left: 10%
+        bottom: -30px
         
         
   //- Errors

app/templates/account/payments-view.jade

@@ -14,7 +14,7 @@ block content
     button.end-subscription-button.btn.btn-lg.btn-warning(data-i18n="subscribe.unsubscribe") Unsubscribe
     .payment-status(data-i18n="account.status_subscribed")
   else if !me.isAnonymous()
-    button.start-subscription-button.btn.btn-lg.btn-success(data-i18n="subscribe.subscribe") Subscribe
+    button.start-subscription-button.btn.btn-lg.btn-success(data-i18n="subscribe.subscribe_title") Subscribe
     if active
       .payment-status(data-i18n="account.status_unsubscribed_active")
     else

app/templates/core/auth.jade

@@ -9,10 +9,7 @@
     if mode === 'login'
       h1(data-i18n="login.log_in") Log In
     if mode === 'signup'
-      if title === 'short'
+      h1(data-i18n="login.sign_up") Create Account
-        h1(data-i18n="login.sign_up") Create Account
-      else
-        h1(data-i18n="signup.create_account_title").long-title Create Account to Save Progress
 
     div#close-modal
       span.glyphicon.glyphicon-remove
@@ -24,9 +21,6 @@
       .alert.alert-success
         span(data-i18n="signup.required") You need to log in before you can that way.
 
-    else if mode === 'signup' && descriptionOn === "yes"
-          p(data-i18n="signup.description") It's free. Just need a couple things and you'll be good to go:
-
     form.form
       .form-group
         label.control-label(for="email")

app/views/core/AuthModal.coffee

@@ -33,11 +33,6 @@ module.exports = class AuthModal extends ModalView
   getRenderData: ->
     c = super()
     c.showRequiredError = @options.showRequiredError
-    c.title = {0: 'short', 1: 'long'}[me.get('testGroupNumber') % 2]
-    c.descriptionOn = {0: 'yes', 1: 'no'}[Math.floor(me.get('testGroupNumber')/2) % 2]
-    if @mode is 'signup'
-      application.tracker.identify authModalTitle: c.title
-      application.tracker.trackEvent 'Started Signup', authModalTitle: c.title, descriptionOn: c.descriptionOn
     c.mode = @mode
     c.formValues = @previousFormInputs or {}
     c.me = me

app/views/core/RootView.coffee

@@ -52,7 +52,17 @@ module.exports = class RootView extends CocoView
 
   onClickSignupButton: ->
     AuthModal = require 'views/core/AuthModal'
-    window.tracker?.trackEvent 'Sign Up', category: 'Homepage', ['Google Analytics'] if @id is 'home-view'
+    switch @id
+      when 'home-view'
+        window.tracker?.trackEvent 'Started Signup', category: 'Homepage', label: 'Homepage'
+        window.tracker?.trackPageView "signup/homepage", ['Google Analytics']
+      when 'world-map-view'
+        # TODO: add campaign data
+        window.tracker?.trackEvent 'Started Signup', category: 'World Map', label: 'World Map'
+        window.tracker?.trackPageView "signup/world-map", ['Google Analytics']
+      else
+        window.tracker?.trackEvent 'Started Signup', label: 'unknown'
+        window.tracker?.trackPageView "signup/unknown", ['Google Analytics']
     @openModalView new AuthModal {mode: 'signup'}
 
   onClickLoginButton: ->

app/views/play/WorldMapView.coffee

@@ -219,7 +219,7 @@ module.exports = class WorldMapView extends RootView
     else
       if level.requiresSubscription and @requiresSubscription and not @levelStatusMap[level.id] and not level.adventurer
         @openModalView new SubscribeModal()
-        window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'map level clicked'
+        window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'map level clicked', level: levelID
         window.tracker?.trackPageView "subscription/show-modal", ['Google Analytics']
       else if $(e.target).attr('disabled')
         Backbone.Mediator.publish 'router:navigate', route: '/contribute/adventurer'

app/views/play/level/ControlBarView.coffee

@@ -26,6 +26,7 @@ module.exports = class ControlBarView extends CocoView
     'click .levels-link-area': 'onClickHome'
     'click .home a': 'onClickHome'
     'click .multiplayer-area': 'onClickMultiplayer'
+    'click #control-bar-sign-up-button': 'onClickSignupButton'
 
   constructor: (options) ->
     @worldName = options.worldName
@@ -95,6 +96,10 @@ module.exports = class ControlBarView extends CocoView
   onClickMultiplayer: (e) ->
     @openModalView new GameMenuModal showTab: 'multiplayer', level: @level, session: @session, supermodel: @supermodel
 
+  onClickSignupButton: ->
+    window.tracker?.trackEvent 'Started Signup', category: 'Play Level', label: 'Control Bar', level: @levelID
+    window.tracker?.trackPageView "signup/play-level", ['Google Analytics']
+
   onDisableControls: (e) -> @toggleControls e, false
   onEnableControls: (e) -> @toggleControls e, true
   toggleControls: (e, enabled) ->

app/views/play/level/LevelLoadingView.coffee

@@ -110,7 +110,7 @@ module.exports = class LevelLoadingView extends CocoView
 
   onClickStartSubscription: (e) ->
     @openModalView new SubscribeModal()
-    window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'level loading'
+    window.tracker?.trackEvent 'Show subscription modal', category: 'Subscription', label: 'level loading', level: @options.level ? 'unknown'
     window.tracker?.trackPageView "subscription/show-modal", ['Google Analytics']
 
   onSubscribed: ->