Merge branch 'master' into production

app/locale/ru.coffee

@@ -10,7 +10,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     for_beginners: "Новичкам"
     multiplayer: "Мультиплеер" # Not currently shown on home page
     for_developers: "Разработчикам" # Not currently shown on home page.
-#    or_ipad: "Or download for iPad"
+    or_ipad: "Или скачайте на iPad"
 
   nav:
     play: "Уровни" # The top nav bar entry where players choose which levels to play
@@ -56,7 +56,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     confirm: "Подтвердить"
     owned: "Уже есть" # For items you own
     locked: "Заблокировано"
-#    purchasable: "Purchasable" # For a hero you unlocked but haven't purchased
+    purchasable: "Можно купить" # For a hero you unlocked but haven't purchased
     available: "Доступно"
     skills_granted: "Умение получено" # Property documentation details
     heroes: "Герои" # Tooltip on hero shop button from /play
@@ -209,8 +209,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     failing: "Неудача"
     action_timeline: "График действий"
     click_to_select: "Выберите персонажа, щёлкнув на нём"
-#    control_bar_multiplayer: "Multiplayer"
-#    control_bar_join_game: "Join Game"
+    control_bar_multiplayer: "Мультиплеер"
+    control_bar_join_game: "Присоединиться"
     reload: "Перезагрузить"
     reload_title: "Перезагрузить код полностью?"
     reload_really: "Вы уверены, что хотите начать уровень сначала?"
@@ -247,7 +247,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     tome_select_a_thang: "Выбрать кого-нибудь для "
     tome_available_spells: "Доступные заклинания"
     tome_your_skills: "Ваши навыки"
-#    tome_help: "Help"
+    tome_help: "Помощь"
     tome_current_method: "Текущий метод"
     hud_continue_short: "Продолжить"
     code_saved: "Код сохранен"
@@ -324,12 +324,12 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     few_gems: "Немного самоцветов"
     pile_gems: "Кучка самоцветов"
     chest_gems: "Сундук с самоцветами"
-#    purchasing: "Purchasing..."
-#    declined: "Your card was declined"
-#    retrying: "Server error, retrying."
-#    prompt_title: "Not Enough Gems"
-#    prompt_body: "Do you want to get more?"
-#    prompt_button: "Enter Shop"
+    purchasing: "Покупка..."
+    declined: "Ваша карта отклонена"
+    retrying: "Ошибка сервера, пробуем еще раз."
+    prompt_title: "Не хватает самоцветов"
+    prompt_body: "Хотите еще?"
+    prompt_button: "Войти в магазин"
 
   choose_hero:
     choose_hero: "Выберите героя"
@@ -355,9 +355,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     range: "Зона" # As in "attack or visual range"
     blocks: "Блокирует" # As in "this shield blocks this much damage"
     skills: "Умения"
-#    available_for_purchase: "Available for Purchase"
+    available_for_purchase: "Доступно для покупки"
 #    level_to_unlock: "Level to unlock:"
-#    restricted_to_certain_heroes: "Only certain heroes can play this level."
+    restricted_to_certain_heroes: "Только определенные герои могут играть этот уровень."
 
 #  skill_docs:
 #    writable: "writable" # Hover over "attack" in Your Skills while playing a level to see most of this
@@ -410,9 +410,9 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     why_codecombat: "Почему CodeCombat?"
     why_paragraph_1: "Нужно научиться программировать? Вам не нужны уроки. Вам нужно написать много кода и прекрасно провести время, делая это."
     why_paragraph_2_prefix: "Вот где программирование. Это должно быть весело. Не забавно, вроде"
-    why_paragraph_2_italic: "вау, значок,"
+    why_paragraph_2_italic: "\"вау, значок\","
     why_paragraph_2_center: "а"
-    why_paragraph_2_italic_caps: "НЕТ, МАМ, Я ДОЛЖЕН ПРОЙТИ УРОВЕНЬ!"
+    why_paragraph_2_italic_caps: "\"НЕТ, МАМ, Я ДОЛЖЕН ПРОЙТИ УРОВЕНЬ!\""
     why_paragraph_2_suffix: "Вот, почему CodeCombat - мультиплеерная игра, а не курс уроков в игровой форме. Мы не остановимся, пока вы не потеряете голову - в данном случае, это хорошо."
     why_paragraph_3: "Если вы собираетесь увлечься какой-нибудь игрой, увлекитесь этой и станьте одним из волшебников века информационных технологий."
     press_title: "Блогерам/Прессе"
@@ -777,8 +777,8 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
     amount_achieved: "Количество"
     achievement: "Достижение"
     category_contributor: "Помощь"
-#    category_ladder: "Ladder"
-#    category_level: "Level"
+    category_ladder: "Ладдер"
+    category_level: "Уровень"
     category_miscellaneous: "Помощь"
     category_levels: "Уровни"
     category_undefined: "Неопределено"
@@ -850,7 +850,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
 #    candidates: "Candidates"
 #    candidate_sessions: "Candidate Sessions"
     user_remark: "Пользовательские поправки"
-#    user_remarks: "User Remarks"
+    user_remarks: "Пользовательские поправки"
     versions: "Версии"
     items: "Предметы"
     heroes: "Герои"

app/templates/core/auth.jade

@@ -82,4 +82,4 @@ block modal-footer
       div.network-login
         .gplus-login-button#gplus-login-button
     div#recover-account-wrapper
-      a(data-toggle="coco-modal", data-target="modal/RecoverModal", data-i18n="login.recover")#link-to-recover recover account
+      a(data-toggle="coco-modal", data-target="core/RecoverModal", data-i18n="login.recover")#link-to-recover recover account

app/templates/editor/level/modal/new-achievement.jade

@@ -1,4 +1,4 @@
-extends /templates/modal/new_model
+extends /templates/editor/modal/new-model-modal
 
 block modal-body-content
   form.form

app/templates/editor/level/save.jade

@@ -1,4 +1,4 @@
-extends /templates/modal/save_version
+extends /templates/editor/modal/save-version-modal
 
 block modal-body-content
   h3= "Level: " + level.get('name') + " - " + (levelNeedsSave ? "Modified" : "Not Modified")

app/views/common/SearchView.coffee

@@ -1,6 +1,6 @@
 RootView = require 'views/core/RootView'
-NewModelModal = require 'views/modal/NewModelModal'
-template = require 'templates/common/search'
+NewModelModal = require 'views/editor/modal/NewModelModal'
+template = require 'templates/common/search-view'
 app = require 'core/application'
 
 class SearchCollection extends Backbone.Collection

app/views/core/RecoverModal.coffee

@@ -1,5 +1,5 @@
 ModalView = require 'views/core/ModalView'
-template = require 'templates/modal/recover'
+template = require 'templates/core/recover-modal'
 forms = require 'core/forms'
 {genericFailure} = require 'core/errors'
 

app/views/editor/achievement/AchievementEditView.coffee

@@ -2,7 +2,7 @@ RootView = require 'views/core/RootView'
 template = require 'templates/editor/achievement/edit'
 Achievement = require 'models/Achievement'
 AchievementPopup = require 'views/core/AchievementPopup'
-ConfirmModal = require 'views/modal/ConfirmModal'
+ConfirmModal = require 'views/editor/modal/ConfirmModal'
 errors = require 'core/errors'
 app = require 'core/application'
 nodes = require 'views/editor/level/treema_nodes'

app/views/editor/article/ArticleEditView.coffee

@@ -2,7 +2,7 @@ RootView = require 'views/core/RootView'
 VersionHistoryView = require './ArticleVersionsModal'
 template = require 'templates/editor/article/edit'
 Article = require 'models/Article'
-SaveVersionModal = require 'views/modal/SaveVersionModal'
+SaveVersionModal = require 'views/editor/modal/SaveVersionModal'
 PatchesView = require 'views/editor/PatchesView'
 require 'views/modal/RevertModal'
 

app/views/editor/article/ArticleVersionsModal.coffee

@@ -1,4 +1,4 @@
-VersionsModal = require 'views/modal/VersionsModal'
+VersionsModal = require 'views/editor/modal/VersionsModal'
 
 module.exports = class ArticleVersionsModal extends VersionsModal
   id: 'editor-article-versions-view'

app/views/editor/component/ComponentVersionsModal.coffee

@@ -1,4 +1,4 @@
-VersionsModal = require 'views/modal/VersionsModal'
+VersionsModal = require 'views/editor/modal/VersionsModal'
 
 module.exports = class ComponentVersionsModal extends VersionsModal
   id: 'editor-component-versions-view'

app/views/editor/docs/ComponentsDocumentationView.coffee

@@ -1,5 +1,5 @@
 CocoView = require 'views/core/CocoView'
-template = require 'templates/docs/components-documentation-view'
+template = require 'templates/editor/docs/components-documentation-view'
 CocoCollection = require 'collections/CocoCollection'
 LevelComponent = require 'models/LevelComponent'
 

app/views/editor/docs/SystemsDocumentationView.coffee

@@ -1,5 +1,5 @@
 CocoView = require 'views/core/CocoView'
-template = require 'templates/docs/systems-documentation-view'
+template = require 'templates/editor/docs/systems-documentation-view'
 CocoCollection = require 'collections/CocoCollection'
 LevelSystem = require 'models/LevelSystem'
 

app/views/editor/level/LevelEditView.coffee

@@ -17,12 +17,12 @@ ComponentsTabView = require './components/ComponentsTabView'
 SystemsTabView = require './systems/SystemsTabView'
 SaveLevelModal = require './modals/SaveLevelModal'
 ForkModal = require 'views/editor/ForkModal'
-SaveVersionModal = require 'views/modal/SaveVersionModal'
+SaveVersionModal = require 'views/editor/modal/SaveVersionModal'
 PatchesView = require 'views/editor/PatchesView'
 RelatedAchievementsView = require 'views/editor/level/RelatedAchievementsView'
 VersionHistoryView = require './modals/LevelVersionsModal'
-ComponentsDocumentationView = require 'views/docs/ComponentsDocumentationView'
-SystemsDocumentationView = require 'views/docs/SystemsDocumentationView'
+ComponentsDocumentationView = require 'views/editor/docs/ComponentsDocumentationView'
+SystemsDocumentationView = require 'views/editor/docs/SystemsDocumentationView'
 LevelFeedbackView = require 'views/editor/level/LevelFeedbackView'
 storage = require 'core/storage'
 

app/views/editor/level/components/LevelComponentEditView.coffee

@@ -3,7 +3,7 @@ template = require 'templates/editor/level/component/level-component-edit-view'
 LevelComponent = require 'models/LevelComponent'
 ComponentVersionsModal = require 'views/editor/component/ComponentVersionsModal'
 PatchesView = require 'views/editor/PatchesView'
-SaveVersionModal = require 'views/modal/SaveVersionModal'
+SaveVersionModal = require 'views/editor/modal/SaveVersionModal'
 
 module.exports = class LevelComponentEditView extends CocoView
   id: 'level-component-edit-view'

app/views/editor/level/modals/LevelVersionsModal.coffee

@@ -1,4 +1,4 @@
-VersionsModal = require 'views/modal/VersionsModal'
+VersionsModal = require 'views/editor/modal/VersionsModal'
 
 module.exports = class LevelVersionsModal extends VersionsModal
   id: 'editor-level-versions-view'

app/views/editor/level/modals/NewAchievementModal.coffee

@@ -1,4 +1,4 @@
-NewModelModal = require 'views/modal/NewModelModal'
+NewModelModal = require 'views/editor/modal/NewModelModal'
 template = require 'templates/editor/level/modal/new-achievement'
 forms = require 'core/forms'
 Achievement = require 'models/Achievement'

app/views/editor/level/modals/SaveLevelModal.coffee

@@ -1,4 +1,4 @@
-SaveVersionModal = require 'views/modal/SaveVersionModal'
+SaveVersionModal = require 'views/editor/modal/SaveVersionModal'
 template = require 'templates/editor/level/save'
 forms = require 'core/forms'
 LevelComponent = require 'models/LevelComponent'

app/views/editor/level/systems/LevelSystemEditView.coffee

@@ -3,7 +3,7 @@ template = require 'templates/editor/level/system/level-system-edit-view'
 LevelSystem = require 'models/LevelSystem'
 SystemVersionsModal = require 'views/editor/level/systems/SystemVersionsModal'
 PatchesView = require 'views/editor/PatchesView'
-SaveVersionModal = require 'views/modal/SaveVersionModal'
+SaveVersionModal = require 'views/editor/modal/SaveVersionModal'
 
 module.exports = class LevelSystemEditView extends CocoView
   id: 'level-system-edit-view'

app/views/editor/level/systems/SystemVersionsModal.coffee

@@ -1,4 +1,4 @@
-VersionsModal = require 'views/modal/VersionsModal'
+VersionsModal = require 'views/editor/modal/VersionsModal'
 
 module.exports = class SystemVersionsModal extends VersionsModal
   id: 'editor-system-versions-view'

app/views/editor/modal/ConfirmModal.coffee

@@ -1,5 +1,5 @@
-ModalView = require '../core/ModalView'
-template = require 'templates/modal/confirm'
+ModalView = require '../../core/ModalView'
+template = require 'templates/editor/modal/confirm-modal'
 
 module.exports = class ConfirmModal extends ModalView
   id: 'confirm-modal'

app/views/editor/modal/NewModelModal.coffee

@@ -1,5 +1,5 @@
 ModalView = require 'views/core/ModalView'
-template = require 'templates/modal/new_model'
+template = require 'templates/editor/modal/new-model-modal'
 forms = require 'core/forms'
 
 module.exports = class NewModelModal extends ModalView

app/views/editor/modal/SaveVersionModal.coffee

@@ -1,5 +1,5 @@
 ModalView = require 'views/core/ModalView'
-template = require 'templates/modal/save_version'
+template = require 'templates/editor/modal/save-version-modal'
 DeltaView = require 'views/editor/DeltaView'
 Patch = require 'models/Patch'
 forms = require 'core/forms'

app/views/editor/modal/VersionsModal.coffee

@@ -1,5 +1,5 @@
 ModalView = require 'views/core/ModalView'
-template = require 'templates/modal/versions'
+template = require 'templates/editor/modal/versions-modal'
 DeltaView = require 'views/editor/DeltaView'
 PatchModal = require 'views/editor/PatchModal'
 nameLoader = require 'core/NameLoader'

app/views/editor/thang/ThangTypeEditView.coffee

@@ -16,7 +16,7 @@ ThangTypeColorsTabView = require './ThangTypeColorsTabView'
 PatchesView = require 'views/editor/PatchesView'
 ForkModal = require 'views/editor/ForkModal'
 VectorIconSetupModal = require 'views/editor/thang/VectorIconSetupModal'
-SaveVersionModal = require 'views/modal/SaveVersionModal'
+SaveVersionModal = require 'views/editor/modal/SaveVersionModal'
 template = require 'templates/editor/thang/thang-type-edit-view'
 storage = require 'core/storage'
 

app/views/editor/thang/ThangTypeVersionsModal.coffee

@@ -1,4 +1,4 @@
-VersionsModal = require 'views/modal/VersionsModal'
+VersionsModal = require 'views/editor/modal/VersionsModal'
 
 module.exports = class ThangTypeVersionsModal extends VersionsModal
   id: 'editor-thang-versions-view'

app/views/i18n/I18NEditModelView.coffee

@@ -5,7 +5,7 @@ template = require 'templates/i18n/i18n-edit-model-view'
 deltasLib = require 'core/deltas'
 
 # in the template, but need to require to load them
-require 'modal/RevertModal'
+require 'views/modal/RevertModal'
 
 module.exports = class I18NEditModelView extends RootView
   className: 'editor i18n-edit-model-view'

app/views/modal/RevertModal.coffee

@@ -1,5 +1,5 @@
 ModalView = require 'views/core/ModalView'
-template = require 'templates/modal/revert'
+template = require 'templates/modal/revert-modal'
 CocoModel = require 'models/CocoModel'
 
 module.exports = class RevertModal extends ModalView

app/views/play/WorldMapView.coffee

@@ -220,6 +220,7 @@ module.exports = class WorldMapView extends RootView
     return if @manuallyPositionedLevelInfoID and levelID isnt @manuallyPositionedLevelInfoID
     @$el.find(".level-info-container[data-level-id='#{levelID}']").hide()
     @manuallyPositionedLevelInfoID = null
+    @$levelInfo = null
 
   onMouseMoveMap: (e) ->
     return if application.isIPadApp

config.coffee

@@ -10,29 +10,6 @@ commonjsHeader = fs.readFileSync('node_modules/brunch/node_modules/commonjs-requ
 regJoin = (s) -> new RegExp(s.replace(/\//, '[\\\/\\\\]'))
 
 
-#- Find all .coffee and .jade files in /app
-  
-dirStack = ['./app']
-coffeeFiles = []
-jadeFiles = []
-
-while dirStack.length
-  dir = dirStack.pop()
-  contents = fs.readdirSync(dir)
-  for file in contents
-    fullPath = "#{dir}/#{file}"
-    stat = fs.statSync(fullPath)
-    if stat.isDirectory()
-      dirStack.push(fullPath)
-    else
-      if _.str.endsWith(file, '.coffee')
-        coffeeFiles.push(fullPath)
-      else if _.str.endsWith(file, '.jade')
-        jadeFiles.push(fullPath)
-    
-console.log "Got #{coffeeFiles.length} coffee files and #{jadeFiles.length} jade files."
-
-
 #- Build the config
 
 exports.config =
@@ -102,6 +79,8 @@ exports.config =
         #- test, demo libraries
         'javascripts/test-app.js': regJoin('^test/app/')
         'javascripts/demo-app.js': regJoin('^test/demo/')
+        
+        #- More output files are generated at the below
 
       order:
         before: [
@@ -180,6 +159,27 @@ exports.config =
       defn = if path in needHeaders then commonjsHeader else ''
       return defn
 
+
+#- Find all .coffee and .jade files in /app
+
+dirStack = ['./app']
+coffeeFiles = []
+jadeFiles = []
+
+while dirStack.length
+  dir = dirStack.pop()
+  contents = fs.readdirSync(dir)
+  for file in contents
+    fullPath = "#{dir}/#{file}"
+    stat = fs.statSync(fullPath)
+    if stat.isDirectory()
+      dirStack.push(fullPath)
+    else
+      if _.str.endsWith(file, '.coffee')
+        coffeeFiles.push(fullPath)
+      else if _.str.endsWith(file, '.jade')
+        jadeFiles.push(fullPath)
+
 for file in coffeeFiles
   inputFile = file.replace('./app', 'app')
   outputFile = file.replace('.coffee', '.js').replace('./app', 'javascripts/app')
@@ -200,4 +200,4 @@ for file in jadeFiles
     exports.config.files.templates.joinTo[possibleViewFilePath] = inputFile
     numBundles += 1
 
-console.log 'Bundled', numBundles, 'templates with their views.' 
+console.log "Got #{coffeeFiles.length} coffee files and #{jadeFiles.length} jade files (bundled #{numBundles} of them together)."