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

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

Browse Source 
Conflicts:
	common/lib/xmodule/xmodule/js/src/problem/edit.coffee
This commit is contained in:
cahrens
2013-01-08 14:56:59 -05:00
parent bc10d080df ae4e7815a9
commit f616aecd81
6 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/templates/widgets/problem-edit.html
View File

@@ -1,7 +1,7 @@
<%include file="metadata-edit.html" />
<section class="problem-editor editor">
<div class="row">
%if markdown != '' or data == '':
%if markdown != '' or data == '<problem>\n</problem>\n':
<div class="editor-bar">
<ul class="format-buttons">
<li><a href="#" class="multiple-choice-button" data-tooltip="Multiple Choice"><span