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

Merge pull request #3816 from matt-sanders/background_fixes

Browse source 
fixes #3796 #3794 #3793
This commit is contained in:
Scott Erickson 2016-08-05 10:33:33 -07:00 committed by GitHub
commit 960d296dd1
4 changed files with 72 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/styles/docs/components-documentation-view.sass
View file

@ -1,6 +1,6 @@
#components-documentation-view
background-color: #e4cf8c
height: 100%
height: calc(100% - 90px)
#toggle-all-component-code
margin: 10px

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

@ -144,12 +144,12 @@ block outer_content
div.tab-pane#related-achievements-view
div.tab-pane#editor-level-documentation
ul.nav.nav-pills.nav-justified
li
a(href="#components-documentation-view", data-toggle="pill", data-i18n="resources.components") Components
li
a(href="#systems-documentation-view", data-toggle="pill", data-i18n="resources.systems") Systems
div.tab-content
ul.nav.nav-pills.nav-justified
li
a(href="#components-documentation-view", data-toggle="pill", data-i18n="resources.components") Components
li
a(href="#systems-documentation-view", data-toggle="pill", data-i18n="resources.systems") Systems
div.tab-pane#components-documentation-view
div.tab-pane#systems-documentation-view

46
app/templates/editor/level/related-achievements.jade
View file

@ -1,23 +1,25 @@
button.btn.btn-primary#new-achievement-button(disabled=(me.isAdmin() === true || me.isArtisan() === true) ? undefined : "true" data-i18n="editor.new_achievement_title") Create a New Achievement
.nano.editor-nano-container
.nano-content
button.btn.btn-primary#new-achievement-button(disabled=(me.isAdmin() === true || me.isArtisan() === true) ? undefined : "true" data-i18n="editor.new_achievement_title") Create a New Achievement
if !view.achievements.models.length
.panel
.panel-body
p(data-i18n="editor.no_achievements") No achievements added for this level yet.
else
table.table.table-hover
thead
tr
th
th(data-i18n="general.name") Name
th(data-i18n="general.description") Description
th XP
tbody
each achievement in view.achievements.models
tr
td(style="width: 20px")
img.achievement-icon-small(src=achievement.getImageURL() alt="#{achievement.get('name') icon")
td
a(href="/editor/achievement/#{achievement.get('slug')}")= achievement.get('name', true)
td= achievement.get('description', true)
td= achievement.get('worth', true)
if !view.achievements.models.length
.panel
.panel-body
p(data-i18n="editor.no_achievements") No achievements added for this level yet.
else
table.table.table-hover
thead
tr
th
th(data-i18n="general.name") Name
th(data-i18n="general.description") Description
th XP
tbody
each achievement in view.achievements.models
tr
td(style="width: 20px")
img.achievement-icon-small(src=achievement.getImageURL() alt="#{achievement.get('name') icon")
td
a(href="/editor/achievement/#{achievement.get('slug')}")= achievement.get('name', true)
td= achievement.get('description', true)
td= achievement.get('worth', true)

82
app/templates/editor/level/tasks-tab.jade
View file

@ -1,42 +1,44 @@
mixin task-row(cid)
- var task = view.getTaskByCID(cid)
- var taskName = task.get('name');
- var isComplete = task.get('complete')
tr.task-row(data-task-cid=cid)
td.task-check
div.checkbox
input(type='checkbox', checked=(isComplete || false)).task-input
if task.get('curEdit') == true
td.edit-cell
td.task-name
input(type="input", value=taskName)#cur-edit
else
td.edit-cell
span.glyphicon.glyphicon-edit.start-edit
td.task-name
- var result = view.getTaskURL(taskName)
if result !== null
// https://github.com/codecombat/codecombat/wiki/Tasks-Tab#<slug goes here>
a(href='https://github.com/codecombat/codecombat/wiki/Tasks-Tab#' + result, target='blank')= taskName
.nano.editor-nano-container
.nano-content
mixin task-row(cid)
- var task = view.getTaskByCID(cid)
- var taskName = task.get('name');
- var isComplete = task.get('complete')
tr.task-row(data-task-cid=cid)
td.task-check
div.checkbox
input(type='checkbox', checked=(isComplete || false)).task-input
if task.get('curEdit') == true
td.edit-cell
td.task-name
input(type="input", value=taskName)#cur-edit
else
span= taskName
td.edit-cell
span.glyphicon.glyphicon-edit.start-edit
td.task-name
- var result = view.getTaskURL(taskName)
if result !== null
// https://github.com/codecombat/codecombat/wiki/Tasks-Tab#<slug goes here>
a(href='https://github.com/codecombat/codecombat/wiki/Tasks-Tab#' + result, target='blank')= taskName
else
span= taskName
block
table.table.table-striped.table-hover
tr
th.task-check Complete
th.edit-cell Edit
th Incomplete Tasks
for task in (view.taskArray() || [])
if task.get('revert').complete !== true
+task-row(task.cid)
tr
th.task-check
th.edit-cell
th Completed Tasks
for task in (view.taskArray() || [])
if task.get('revert').complete === true
+task-row(task.cid)
button#create-task.btn.btn-primary Add Task
if view.missingDefaults().length !== 0
button#add-default-tasks.btn.btn-default Add Default Tasks
block
table.table.table-striped.table-hover
tr
th.task-check Complete
th.edit-cell Edit
th Incomplete Tasks
for task in (view.taskArray() || [])
if task.get('revert').complete !== true
+task-row(task.cid)
tr
th.task-check
th.edit-cell
th Completed Tasks
for task in (view.taskArray() || [])
if task.get('revert').complete === true
+task-row(task.cid)
button#create-task.btn.btn-primary Add Task
if view.missingDefaults().length !== 0
button#add-default-tasks.btn.btn-default Add Default Tasks