Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'feature/cas/speed-editor' of github.com:MITx/mitx into feature/cas/speed-editor

Browse Source
This commit is contained in:
Don Mitchell
2013-01-09 11:38:23 -05:00
parent fff9afdeb8 31f9084b61
commit 144c6bca8b
5 changed files with 30 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cms/static/coffee/src/views/unit.coffee
View File

@@ -68,13 +68,6 @@ class CMS.Views.UnitEdit extends Backbone.View
@$newComponentItem.removeClass('adding')
@$newComponentItem.find('.rendered-component').remove()
closeEditor: (event) =>
@$editor.slideUp(150)
$modalCover.fadeOut(150)
$modalCover.unbind('click', @closeEditor)
@$editor.slideUp(150)
@$componentItem.removeClass('editing')
saveNewComponent: (event) =>
event.preventDefault()

BIN
cms/static/img/problem-settings-icon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.3 KiB

57
cms/static/sass/_graphics.scss
View File

@@ -310,60 +310,3 @@
vertical-align: middle;
background: url(../img/spinner-in-field.gif) no-repeat;
}
.problem-editor-icon {
display: inline-block;
width: 26px;
height: 21px;
vertical-align: middle;
background: url(../img/problem-editor-icons.png) no-repeat;
}
.problem-editor-icon.multiple-choice {
background-position: 0 0;
}
.problem-editor-icon.checks {
background-position: -56px 0;
}
.problem-editor-icon.string {
width: 28px;
background-position: -111px 0;
}
.problem-editor-icon.number {
width: 24px;
background-position: -168px 0;
}
.problem-editor-icon.dropdown {
width: 17px;
background-position: -220px 0;
}
.settings-icon {
display: inline-block;
width: 20px;
height: 20px;
vertical-align: middle;
background: url(../img/problem-settings-icon.png) no-repeat;
}
.sort-icon {
font-size: 7px;
vertical-align: middle;
&.down:before {
content: '▼';
}
&.up:before {
content: '▲';
}
}

101
cms/templates/unit.html
View File

@@ -19,107 +19,6 @@
$(this).prepend($emptyEditor);
});
})();
function setEditorTab(e) {
e.preventDefault();
$('.editor-tabs .current').removeClass('current');
$(this).addClass('current');
switch($(this).attr('data-tab')) {
case 'simple':
currentEditor = simpleEditor;
$(simpleEditor.getWrapperElement()).show();
$(xmlEditor.getWrapperElement()).hide();
$(simpleEditor).focus();
onSimpleEditorUpdate();
break;
case 'xml':
currentEditor = xmlEditor;
$(simpleEditor.getWrapperElement()).hide();
$(xmlEditor.getWrapperElement()).show();
$(xmlEditor).focus();
xmlEditor.refresh();
break;
case 'visual':
currentEditor = visualEditor;
convertHTMLToVisual();
$('table.mceToolbar').show();
$(htmlEditor.getWrapperElement()).hide();
break;
case 'html':
currentEditor = htmlEditor;
$('table.mceToolbar').hide();
$(htmlEditor.getWrapperElement()).show();
$(htmlEditor).focus();
convertVisualToHTML();
htmlEditor.refresh();
break;
}
}
</script>
<script type="text/template" id="simple-editor-cheatsheet">
<article class="simple-editor-cheatsheet">
<div class="cheatsheet-wrapper">
<div class="row">
<h6>Multiple Choice</h6>
<div class="col sample">
<img src="/static/img/choice-example.png" />
</div>
<div class="col">
<pre><code>( ) red
( ) green
(x) blue</code></pre>
</div>
</div>
<div class="row">
<h6>Multiple Check</h6>
<div class="col sample">
<img src="/static/img/multi-example.png" />
</div>
<div class="col">
<pre><code>[ ] earth
[ ] wind
[x] water</code></pre>
</div>
</div>
<div class="row">
<h6>String Response</h6>
<div class="col sample">
<img src="/static/img/string-example.png" />
</div>
<div class="col">
<pre><code>= dog</code></pre>
</div>
</div>
<div class="row">
<h6>Numerical Response</h6>
<div class="col sample">
<img src="/static/img/number-example.png" />
</div>
<div class="col">
<pre><code>= 3.14 +- 2%</code></pre>
</div>
</div>
<div class="row">
<h6>Option Response</h6>
<div class="col sample">
<img src="/static/img/select-example.png" />
</div>
<div class="col">
<pre><code>[[wrong, (right)]]</code></pre>
</div>
</div>
</div>
</article>
</script>
<script type="text/template" id="component-actions">
<div class="component-actions">
<a href="#" class="edit-button"><span class="edit-icon white"></span>Edit</a>
<a href="#" class="delete-button"><span class="delete-icon white"></span>Delete</a>
</div>
<a href="#" class="drag-handle"></a>
</script>
</%block>

30
common/lib/xmodule/xmodule/css/problem/edit.scss
View File

@@ -142,5 +142,35 @@
}
}
.problem-editor-icon {
display: inline-block;
width: 26px;
height: 21px;
vertical-align: middle;
background: url(../img/problem-editor-icons.png) no-repeat;
}
.problem-editor-icon.multiple-choice {
background-position: 0 0;
}
.problem-editor-icon.checks {
background-position: -56px 0;
}
.problem-editor-icon.string {
width: 28px;
background-position: -111px 0;
}
.problem-editor-icon.number {
width: 24px;
background-position: -168px 0;
}
.problem-editor-icon.dropdown {
width: 17px;
background-position: -220px 0;
}