codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-03-14 07:00:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactored core templates into a core folder.

Browse source
This commit is contained in:
Scott Erickson 2014-11-29 11:39:37 -08:00
parent 3e0394d0d8
commit 1c33842125
47 changed files with 43 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/core/errors.coffee
View file

@ -1,4 +1,4 @@
errorModalTemplate = require 'templates/modal/error'
errorModalTemplate = require 'templates/core/error'
{applyErrorsToForm} = require 'core/forms'
module.exports.parseServerError = (text) ->
@ -42,7 +42,7 @@ module.exports.connectionFailure = connectionFailure = ->
showErrorModal(html)
showErrorModal = (html) ->
# TODO: make a views/modal/error_modal view for this to use so the template can reuse templates/modal/modal_base?
# TODO: make a views/modal/error_modal view for this to use so the template can reuse templates/core/modal-base?
$('#modal-wrapper').html(html)
$('.modal:visible').modal('hide')
$('#modal-error').modal('show')

2
app/templates/account/job_profile_code_modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3 Applicant Code for

0
app/templates/achievements/achievement-popup.jade → app/templates/core/achievement-popup.jade
View file

2
app/templates/core/auth.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
if mode === 'login'

2
app/templates/modal/contact.jade → app/templates/core/contact.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="contact.contact_us") Contact CodeCombat...

2
app/templates/modal/diplomat_suggestion.jade → app/templates/core/diplomat-suggestion.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="diplomat_suggestion.title") Help translate CodeCombat!

0
app/templates/modal/error.jade → app/templates/core/error.jade
View file

0
app/templates/loading_error.jade → app/templates/core/loading-error.jade
View file

0
app/templates/loading.jade → app/templates/core/loading.jade
View file

0
app/templates/modal/modal_base.jade → app/templates/core/modal-base.jade
View file

0
app/templates/not_found.jade → app/templates/core/not-found.jade
View file

2
app/templates/editor/component/add-thang-components-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h1 Add Components

2
app/templates/editor/fork-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="editor.fork_title") Fork New Version

2
app/templates/editor/level/component/new.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="editor.new_component_title") Create New Component

2
app/templates/editor/level/modal/generate-terrain-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="editor.pick_a_terrain") Pick a Terrain

2
app/templates/editor/level/modal/world-select-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content

2
app/templates/editor/level/system/add.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="editor.add_system_title") Add Systems to Level

2
app/templates/editor/level/system/new.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="editor.create_system_title") Create New System

2
app/templates/editor/patch_modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
.modal-header-content

2
app/templates/editor/thang/vector-icon-setup-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3 Choose Container for Vector Icon

2
app/templates/modal/confirm.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3 #{confirmTitle}

2
app/templates/modal/employer_signup_modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
if userIsAnonymous || !userIsAuthorized

2
app/templates/modal/job_profile_contact.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/contact
extends /templates/core/contact
block modal-header-content
h3(data-i18n="contact.contact_candidate") Contact Candidate

2
app/templates/modal/model.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header

2
app/templates/modal/new_model.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="#{currentNew}") Create New #{modelLabel}

2
app/templates/modal/recover.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="recover.recover_account_title") Recover Account

2
app/templates/modal/revert.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="editor.revert_models") Revert Models

2
app/templates/modal/save_version.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
if isPatch

2
app/templates/modal/versions.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
if dataList

2
app/templates/modal/wizard_settings.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="wizard_settings.title2") Customize Your Character

2
app/templates/play/ladder/play_modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="ladder.choose_opponent") Choose an Opponent

2
app/templates/play/level/modal/hero-victory-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
img(src="/images/pages/play/level/modal/victory_modal_blue_banner.png")#victory-banner
img(src="/images/pages/play/level/modal/victory_word.png")#victory-header.out

2
app/templates/play/level/modal/infinite_loop.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="play_level.infinite_loop_title") Infinite Loop Detected

2
app/templates/play/level/modal/keyboard_shortcuts.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="keyboard_shortcuts.keyboard_shortcuts") Keyboard Shortcuts

2
app/templates/play/level/modal/reload-level-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="play_level.reload_title") Reload All Code?

2
app/templates/play/level/modal/victory.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3

2
app/templates/play/modal/play-account-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="play.account") Account

2
app/templates/play/modal/play-achievements-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="play.achievements") Achievements

2
app/templates/play/modal/play-level-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h1#choose-hero-header.choose-hero-active.secret(data-i18n="choose_hero.choose_hero") Choose Your Hero

2
app/templates/play/modal/play-settings-modal.jade
View file

@ -1,4 +1,4 @@
extends /templates/modal/modal_base
extends /templates/core/modal-base
block modal-header-content
h3(data-i18n="play.settings") Settings

2
app/views/core/AchievementPopup.coffee
View file

@ -1,5 +1,5 @@
CocoView = require 'views/core/CocoView'
template = require 'templates/achievements/achievement-popup'
template = require 'templates/core/achievement-popup'
User = require '../../models/User'
Achievement = require '../../models/Achievement'

4
app/views/core/CocoView.coffee
View file

@ -1,8 +1,8 @@
SuperModel = require 'models/SuperModel'
utils = require 'core/utils'
CocoClass = require 'core/CocoClass'
loadingScreenTemplate = require 'templates/loading'
loadingErrorTemplate = require 'templates/loading_error'
loadingScreenTemplate = require 'templates/core/loading'
loadingErrorTemplate = require 'templates/core/loading-error'
lastToggleModalCall = 0
visibleModal = null

2
app/views/core/ContactModal.coffee
View file

@ -1,5 +1,5 @@
ModalView = require 'views/core/ModalView'
template = require 'templates/modal/contact'
template = require 'templates/core/contact'
forms = require 'core/forms'
{sendContactMessage} = require 'core/contact'

2
app/views/core/DiplomatSuggestionModal.coffee
View file

@ -1,5 +1,5 @@
ModalView = require 'views/core/ModalView'
template = require 'templates/modal/diplomat_suggestion'
template = require 'templates/core/diplomat-suggestion'
{me} = require 'core/auth'
forms = require 'core/forms'

2
app/views/core/ModalView.coffee
View file

@ -7,7 +7,7 @@ module.exports = class ModalView extends CocoView
modalWidthPercent: null
plain: false
instant: false
template: require 'templates/modal/modal_base'
template: require 'templates/core/modal-base'
events:
'click a': 'toggleModal'

2
app/views/core/NotFoundView.coffee
View file

@ -1,5 +1,5 @@
RootView = require 'views/core/RootView'
template = require 'templates/not_found'
template = require 'templates/core/not-found'
module.exports = class NotFoundView extends RootView
id: 'not-found-view'

12
config.coffee
View file

@ -140,17 +140,7 @@ exports.config =
templates:
defaultExtension: 'jade'
joinTo:
'javascripts/app.js': [
regJoin('^app/templates/core')
'app/templates/modal/error.jade'
'app/templates/not_found.jade'
'app/templates/achievements/achievement-popup.jade'
'app/templates/loading.jade'
'app/templates/loading_error.jade'
'app/templates/modal/contact.jade'
'app/templates/modal/modal_base.jade'
'app/templates/modal/diplomat_suggestion.jade'
]
'javascripts/app.js': regJoin('^app/templates/core')
'javascripts/app/views/play.js': regJoin('^app/templates/play')
'javascripts/app/views/game-menu.js': regJoin('^app/templates/game-menu')
'javascripts/app/views/editor.js': regJoin('^app/templates/editor')