codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 08:08:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Work on thang tab

Browse source
This commit is contained in:
Alexei Nikitin 2014-04-08 02:49:27 +04:00
parent 5f062ad25c
commit e87c0c4b91
7 changed files with 28 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/locale/en.coffee
View file

@ -301,10 +301,14 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
contact_us: "contact us!"
hipchat_prefix: "You can also find us in our"
hipchat_url: "HipChat room."
back: "Back"
revert: "Revert"
revert_models: "Revert Models"
fork_title: "Fork New Version"
fork_creating: "Creating Fork..."
more: "More"
wiki: "Wiki"
live_chat: "Live Chat"
level_publish: "Publish This Level (irreversible)?"
level_some_options: "Some Options?"
level_tab_thangs: "Thangs"
@ -313,8 +317,11 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
level_tab_components: "Components"
level_tab_systems: "Systems"
level_tab_thangs_title: "Current Thangs"
level_tab_thangs_all: "All"
level_tab_thangs_conditions: "Starting Conditions"
level_tab_thangs_add: "Add Thangs"
delete: "Delete"
duplicate: "Duplicate"
level_settings_title: "Settings"
level_component_tab_title: "Current Components"
level_component_btn_new: "Create New Component"
@ -349,7 +356,7 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
body: "Body"
version: "Version"
commit_msg: "Commit Message"
history: "History"
version_history: "Version History"
version_history_for: "Version History for: "
result: "Result"
results: "Results"
@ -371,7 +378,6 @@ module.exports = nativeDescription: "English", englishDescription: "English", tr
medium: "Medium"
hard: "Hard"
about:
who_is_codecombat: "Who is CodeCombat?"
why_codecombat: "Why CodeCombat?"

11
app/locale/ru.coffee
View file

@ -301,10 +301,14 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
contact_us: "свяжитесь с нами!"
hipchat_prefix: "Также вы можете найти нас в нашей"
hipchat_url: "комнате HipChat."
back: "Назад"
revert: "Откатить"
revert_models: "Откатить Модели"
fork_title: "Форк новой версии"
fork_creating: "Создание форка..."
more: "Ещё"
wiki: "Вики"
live_chat: "Онлайн-чат"
level_publish: "Опубликовать уровень (необратимо)?"
level_some_options: "Ещё опции"
level_tab_thangs: "Объекты"
@ -313,8 +317,11 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
level_tab_components: "Компоненты"
level_tab_systems: "Системы"
level_tab_thangs_title: "Текущие объекты"
level_tab_thangs_all: "Все"
level_tab_thangs_conditions: "Начальные условия"
level_tab_thangs_add: "Добавить объект"
delete: "Удалить"
duplicate: "Дублировать"
level_settings_title: "Настройки"
level_component_tab_title: "Текущие компоненты"
level_component_btn_new: "Создать новый компонент"
@ -349,7 +356,7 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
body: "Содержание"
version: "Версия"
commit_msg: "Сопроводительное сообщение"
history: "История"
version_history: "История версий"
version_history_for: "История версий для: "
result: "Результат"
results: "Результаты"
@ -635,4 +642,4 @@ module.exports = nativeDescription: "русский", englishDescription: "Russi
facebook_friend_sessions: "Сессии друзей Facebook"
gplus_friends: "Друзья G+"
gplus_friend_sessions: "Сессии друзей G+"
leaderboard: "таблица лидеров"
leaderboard: "таблица лидеров"

2
app/templates/editor/article/edit.jade
View file

@ -10,7 +10,7 @@ block content
li.active
| #{article.attributes.name}
button(data-i18n="general.history").btn.btn-primary#history-button History
button(data-i18n="general.version_history").btn.btn-primary#history-button Version History
button(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert", disabled=authorized === true ? undefined : "true").btn.btn-primary#revert-button Revert
button(data-i18n="article.edit_btn_preview", disabled=authorized === true ? undefined : "true").btn.btn-primary#preview-button Preview
button(data-toggle="coco-modal", data-target="modal/save_version", data-i18n="common.save", disabled=authorized === true ? undefined : "true").btn.btn-primary#save-button Save

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

@ -15,7 +15,7 @@ nav.navbar.navbar-default(role='navigation')
li
a(href="#component-settings" data-toggle="tab" data-i18n="editor.level_component_settings") Settings
ul.nav.navbar-nav.navbar-left
li(data-i18n="general.history").btn.btn-primary.navbar-btn#history-button History
li(data-i18n="general.version_history").btn.btn-primary.navbar-btn#history-button Version History
ul.nav.navbar-nav.navbar-right
li(data-i18n="editor.level_component_btn_new").btn.btn-primary.navbar-btn#create-new-component-button Create New Component

10
app/templates/editor/level/edit.jade
View file

@ -7,7 +7,7 @@ block outer_content
.container-fluid
ul.nav.navbar-nav
li
a(href="/editor/level") Back
a(href="/editor/level", data-i18n="editor.back") Back
.navbar-header
span.navbar-brand
span(data-i18n="editor.level_title") Level Editor
@ -37,18 +37,18 @@ block outer_content
li.divider
li.dropdown
a.dropdown-toggle(href='#', data-toggle='dropdown')
a.dropdown-toggle(href='#', data-toggle='dropdown', data-i18n="editor.more")
| More
b.caret
ul.dropdown-menu
li#history-button
a(href='#', data-i18n="general.version_history") Version History
li
a(href='https://github.com/codecombat/codecombat/wiki/Artisan-Home') Wiki
a(href='https://github.com/codecombat/codecombat/wiki/Artisan-Home', data-i18n="editor.wiki") Wiki
li
a(href='http://www.hipchat.com/g3plnOKqa') Live Chat
a(href='http://www.hipchat.com/g3plnOKqa', data-i18n="editor.live_chat") Live Chat
li
a(href='http://discourse.codecombat.com/category/artisan') Forum
a(href='http://discourse.codecombat.com/category/artisan', data-i18n="nav.forum") Forum
li
a(data-toggle="coco-modal", data-target="modal/contact", data-i18n="nav.contact") Email

6
app/templates/editor/level/thangs_tab.jade
View file

@ -1,7 +1,7 @@
.thangs-container.thangs-column
h3(data-i18n="editor.level_tab_thangs_title") Current Thangs
.btn-group(data-toggle="buttons-radio")#extant-thangs-filter
button.btn.btn-primary All
button.btn.btn-primary(data-i18n="editor.level_tab_thangs_all") All
button.btn.btn-primary(value="Unit", title="Unit")
i.icon-user
button.btn.btn-primary(value="Wall", title="Wall")
@ -19,9 +19,9 @@
#canvas-wrapper
ul.dropdown-menu#contextmenu
li#delete
a Delete
a(data-i18n="editor.delete") Delete
li#duplicate
a Duplicate
a(data-i18n="editor.duplicate") Duplicate
canvas(width=1848, height=1178)#surface
#canvas-left-gradient.gradient
#canvas-top-gradient.gradient

2
app/templates/editor/thang/edit.jade
View file

@ -12,7 +12,7 @@ block content
img#portrait.img-thumbnail
button.btn.btn-secondary#history-button(data-i18n="general.history") History
button.btn.btn-secondary#history-button(data-i18n="general.version_history") Version History
button.btn.btn-primary#save-button(data-toggle="coco-modal", data-target="modal/save_version", data-i18n="common.save", disabled=authorized === true ? undefined : "true") Save
button.btn.btn-primary#revert-button(data-toggle="coco-modal", data-target="modal/revert", data-i18n="editor.revert", disabled=authorized === true ? undefined : "true") Revert