Fixed Issue #26

2025-03-22 10:55:19 -04:00 · 2014-01-10 22:31:26 +01:00 · 2014-01-10 22:31:26 +01:00 · 100a296951
commit 100a296951
parent 2b6a7cf753
25 changed files with 37 additions and 16 deletions
--- a/app/locale/fr.coffee
+++ b/app/locale/fr.coffee
@ -179,3 +179,6 @@ module.exports = nativeDescription: "français", englishDescription: "French", t
 #    tome_select_a_thang: "Select Someone for "
 #    tome_available_spells: "Available Spells"
 #    hud_continue: "Continue (press shift-space)"
+
+  editor:
+    new_component_title: "creér un composant"
--- a/app/templates/editor/level/component/new.jade
+++ b/app/templates/editor/level/component/new.jade
@ -1,5 +1,8 @@
 extends /templates/modal/modal_base

+block modal-header-content
+  h3(data-i18n="editor.new_component_title") Create New Component
+
 block modal-body-content
  form.form-horizontal
    .control-group
--- a/app/templates/editor/level/fork.jade
+++ b/app/templates/editor/level/fork.jade
@ -1,5 +1,8 @@
 extends /templates/modal/modal_base

+block modal-header-content
+  h3(data-i18n="editor.fork_title") Fork New Version
+
 block modal-body-content
  form#save-level-form.form-horizontal
    .control-group
--- a/app/templates/editor/level/save.jade
+++ b/app/templates/editor/level/save.jade
@ -1,5 +1,8 @@
 extends /templates/modal/save_version

+block modal-header-content
+  h3(data-i18n="editor.save_view_title") Save New Version
+
 block content
  h3= "Level: " + level.get('name') + " - " + (levelNeedsSave ? "Modified" : "Not Modified")
  if levelNeedsSave
--- a/app/templates/editor/level/system/add.jade
+++ b/app/templates/editor/level/system/add.jade
@ -1,5 +1,8 @@
 extends /templates/modal/modal_base

+block modal-header-content
+  h3(data-i18n="editor.add_system_title") Add Systems to Level
+
 block modal-body-content
  ul.available-systems-list

--- a/app/templates/editor/level/system/new.jade
+++ b/app/templates/editor/level/system/new.jade
@ -1,5 +1,8 @@
 extends /templates/modal/modal_base

+block modal-header-content
+  h3(data-i18n="editor.create_system_title") Create New System
+
 block modal-body-content
  form.form-horizontal
    .control-group
--- a/app/templates/modal/contact.jade
+++ b/app/templates/modal/contact.jade
@ -1,3 +1,6 @@
+block modal-header-content
+  h3(data-i18n="contact.contact_modal_title") Contact
+
 .modal-header
  .button.close(type="button", data-dismiss="modal", aria-hidden="true") &times;
  h3(data-i18n="contact.contact_us") Contact CodeCombat...
--- a/app/templates/modal/login.jade
+++ b/app/templates/modal/login.jade
@ -1,5 +1,8 @@
 extends /templates/modal/modal_base

+block modal-header-content
+  h3(data-i18n="login.login_modal_title") Log In
+
 block modal-body-content
  .form-inline
    .control-group
--- a/app/templates/modal/modal_base.jade
+++ b/app/templates/modal/modal_base.jade
@ -3,7 +3,7 @@ block modal-header
    if closeButton
      .button.close(type="button", data-dismiss="modal", aria-hidden="true") &times;
    block modal-header-content
-      h3= modalTitle
+      h3 man bites God
    
 block modal-body
  .modal-body
--- a/app/templates/modal/recover.jade
+++ b/app/templates/modal/recover.jade
@ -1,5 +1,8 @@
 extends /templates/modal/modal_base

+block modal-header-content
+  h3(data-i18n="recover.recover_account_title") Recover Account
+
 block modal-body-content
  .form-inline
    .control-group
--- a/app/templates/modal/save_version.jade
+++ b/app/templates/modal/save_version.jade
@ -1,5 +1,7 @@
 .modal-header
  h3 Save
+  block content
+    h3(data-i18n="save.save_version_title") Save New Version
 .modal-body
  block content
    form.form-horizontal
--- a/app/templates/modal/signup.jade
+++ b/app/templates/modal/signup.jade
@ -1,5 +1,8 @@
 extends /templates/modal/modal_base

+block modal-header-content
+  h3(data-i18n="signup.create_account_title") Create Account to Save Progress
+
 block modal-body-content
  .modal-body
    p(data-i18n="signup.description") It's free. Just need a couple things and you'll be good to go:
--- a/app/templates/modal/wizard_settings.jade
+++ b/app/templates/modal/wizard_settings.jade
@ -1,5 +1,8 @@
 extends /templates/modal/modal_base

+block modal-header-content
+  h3(data-i18n="modal.wizard_settings_title") Wizard Settings
+
 block modal-body-content
  h4 Customize Your Avatar
  
--- a/app/views/editor/level/component/new.coffee
+++ b/app/views/editor/level/component/new.coffee
@ -8,7 +8,6 @@ forms = require 'lib/forms'
 module.exports = class LevelComponentNewView extends View
  id: "editor-level-component-new-modal"
  template: template
-  modalTitle: "Create New Component"
  instant: false
  modalWidthPercent: 60

--- a/app/views/editor/level/fork_view.coffee
+++ b/app/views/editor/level/fork_view.coffee
@ -8,7 +8,6 @@ module.exports = class LevelForkView extends View
  template: template
  instant: false
  modalWidthPercent: 60
-  modalTitle: "Fork New Version"

  events:
    'click #fork-level-confirm-button': 'forkLevel'
--- a/app/views/editor/level/save_view.coffee
+++ b/app/views/editor/level/save_view.coffee
@ -8,7 +8,6 @@ module.exports = class LevelSaveView extends SaveVersionModal
  template: template
  instant: false
  modalWidthPercent: 60
-  modalTitle: "Save New Version"

  events:
    'click #save-version-button': 'commitLevel'
--- a/app/views/editor/level/system/add.coffee
+++ b/app/views/editor/level/system/add.coffee
@ -12,7 +12,6 @@ module.exports = class LevelSystemAddView extends View
  id: "editor-level-system-add-modal"
  template: template
  instant: true
-  modalTitle: "Add Systems to Level"

  events:
    'click .available-systems-list li': 'onAddSystem'
--- a/app/views/editor/level/system/new.coffee
+++ b/app/views/editor/level/system/new.coffee
@ -8,7 +8,6 @@ forms = require 'lib/forms'
 module.exports = class LevelSystemNewView extends View
  id: "editor-level-system-new-modal"
  template: template
-  modalTitle: "Create New System"
  instant: false
  modalWidthPercent: 60

--- a/app/views/kinds/ModalView.coffee
+++ b/app/views/kinds/ModalView.coffee
@ -2,7 +2,6 @@ CocoView = require './CocoView'

 module.exports = class ModalView extends CocoView
  className: "modal hide fade"
-  modalTitle: "Man Bites God"
  closeButton: true
  closesOnClickOutside: true
  modalWidthPercent: null
@ -14,14 +13,12 @@ module.exports = class ModalView extends CocoView
    options ?= {}
    @className = @className.replace " fade", "" if options.instant
    @closeButton = options.closeButton if options.closeButton?
-    @modalTitle = options.modalTitle if options.modalTitle
    @modalWidthPercent = options.modalWidthPercent if options.modalWidthPercent
    super options

  getRenderData: (context={}) =>
    context = super(context)
    context.closeButton = @closeButton
-    context.modalTitle = @modalTitle
    context

  subscriptions:
--- a/app/views/modal/contact_modal.coffee
+++ b/app/views/modal/contact_modal.coffee
@ -22,7 +22,6 @@ contactSchema =
 module.exports = class ContactView extends View
  id: "contact-modal"
  template: template
-  modalTitle: "Contact"

  events:
    "click #contact-submit-button": "contact"
--- a/app/views/modal/login_modal.coffee
+++ b/app/views/modal/login_modal.coffee
@ -13,7 +13,6 @@ filterKeyboardEvents = (allowedEvents, func) ->
 module.exports = class LoginModalView extends View
  id: "login-modal"
  template: template
-  modalTitle: "Log In"

  events:
    "click #login-button": "loginAccount"
--- a/app/views/modal/recover_modal.coffee
+++ b/app/views/modal/recover_modal.coffee
@ -12,8 +12,7 @@ filterKeyboardEvents = (allowedEvents, func) ->
 module.exports = class RecoverModalView extends View
  id: "recover-modal"
  template: template
-  modalTitle: "Recover Account"
-
+  
  events:
    "click #recover-button": "recoverAccount"
    "keydown input": "recoverAccount"
--- a/app/views/modal/save_version_modal.coffee
+++ b/app/views/modal/save_version_modal.coffee
@ -4,7 +4,6 @@ template = require 'templates/modal/save_version'
 module.exports = class SaveVersionModal extends ModalView
  id: 'save-version-modal'
  template: template
-  modalTitle: 'Save New Version'

  events:
    'click #save-version-button': 'onClickSaveButton'
--- a/app/views/modal/signup_modal.coffee
+++ b/app/views/modal/signup_modal.coffee
@ -13,7 +13,6 @@ filterKeyboardEvents = (allowedEvents, func) ->
 module.exports = class SignupModalView extends View
  id: "signup-modal"
  template: template
-  modalTitle: "Create Account to Save Progress"

  events:
    "click #signup-confirm-age": "checkAge"
--- a/app/views/modal/wizard_settings_modal.coffee
+++ b/app/views/modal/wizard_settings_modal.coffee
@ -6,7 +6,6 @@ ThangType = require 'models/ThangType'
 module.exports = class WizardSettingsView extends View
  id: "wizard-settings-modal"
  template: template
-  modalTitle: "Wizard Settings"
  closesOnClickOutside: false

  events: