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

Fixed #1268.

Browse source
This commit is contained in:
Nick Winter 2014-08-29 17:33:25 -07:00
parent b918f5adfb
commit 63f2c5db4f
5 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/styles/editor/achievement/edit.sass
View file

@ -4,7 +4,7 @@
.treema-root
margin: 28px 0px 20px
button
.achievement-tool-button
float: right
margin-top: 15px
margin-left: 10px

6
app/styles/editor/article/edit.sass
View file

@ -2,11 +2,11 @@
.treema-root
margin-bottom: 20px
button
.article-tool-button
float: right
margin-top: 15px
margin-bottom: 15px
margin-left: 10px
textarea
width: 92%
height: 300px
height: 300px

6
app/templates/editor/achievement/edit.jade
View file

@ -10,9 +10,9 @@ block content
li.active
| #{achievement.attributes.name}
button(data-i18n="", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#recalculate-button Recalculate
button(data-i18n="common.delete", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#delete-button Delete
button(data-i18n="common.save", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#save-button Save
button.achievement-tool-button(data-i18n="", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#recalculate-button Recalculate
button.achievement-tool-button(data-i18n="common.delete", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#delete-button Delete
button.achievement-tool-button(data-i18n="common.save", disabled=me.isAdmin() === true ? undefined : "true").btn.btn-primary#save-button Save
h3(data-i18n="achievement.edit_achievement_title") Edit Achievement
span

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

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

4
app/views/editor/thang/ThangTypeEditView.coffee
View file

@ -59,6 +59,10 @@ module.exports = class ThangTypeEditView extends RootView
@updateFileSize()
@refreshAnimation = _.debounce @refreshAnimation, 500
showLoading: ($el) ->
$el ?= @$el.find('.outer-content')
super($el)
getRenderData: (context={}) ->
context = super(context)
context.thangType = @thangType