Commit 72eef72d by Calen Pennington

Html Module can now be editing, saved, and re-opened

parent f9bb8a70
from mitxmako.shortcuts import render_to_response from mitxmako.shortcuts import render_to_response
from keystore.django import keystore from keystore.django import keystore
from django_future.csrf import ensure_csrf_cookie
from django.http import HttpResponse
import json
@ensure_csrf_cookie
def index(request): def index(request):
# TODO (cpennington): These need to be read in from the active user # TODO (cpennington): These need to be read in from the active user
org = 'mit.edu' org = 'mit.edu'
...@@ -20,3 +24,10 @@ def edit_item(request): ...@@ -20,3 +24,10 @@ def edit_item(request):
'type': item.type, 'type': item.type,
'name': item.name, 'name': item.name,
}) })
def save_item(request):
item_id = request.POST['id']
data = json.loads(request.POST['data'])
keystore().update_item(item_id, data)
return HttpResponse(json.dumps({}))
...@@ -22,6 +22,8 @@ Longer TODO: ...@@ -22,6 +22,8 @@ Longer TODO:
import sys import sys
import tempfile import tempfile
import os.path import os.path
import os
import errno
from path import path from path import path
############################ FEATURE CONFIGURATION ############################# ############################ FEATURE CONFIGURATION #############################
...@@ -156,7 +158,15 @@ PIPELINE_CSS = { ...@@ -156,7 +158,15 @@ PIPELINE_CSS = {
PIPELINE_ALWAYS_RECOMPILE = ['sass/base-style.scss'] PIPELINE_ALWAYS_RECOMPILE = ['sass/base-style.scss']
from x_module import XModuleDescriptor from x_module import XModuleDescriptor
js_file_dir = tempfile.mkdtemp('js', dir=PROJECT_ROOT / "static") js_file_dir = PROJECT_ROOT / "static" / "coffee" / "module"
try:
os.makedirs(js_file_dir)
except OSError as exc:
if exc.errno == errno.EEXIST:
pass
else:
raise
module_js_sources = [] module_js_sources = []
for xmodule in XModuleDescriptor.load_classes(): for xmodule in XModuleDescriptor.load_classes():
js = xmodule.get_javascript() js = xmodule.get_javascript()
...@@ -172,7 +182,7 @@ for xmodule in XModuleDescriptor.load_classes(): ...@@ -172,7 +182,7 @@ for xmodule in XModuleDescriptor.load_classes():
PIPELINE_JS = { PIPELINE_JS = {
'main': { 'main': {
'source_filenames': ['coffee/main.coffee'], 'source_filenames': ['coffee/main.coffee', 'coffee/unit.coffee'],
'output_filename': 'js/main.js', 'output_filename': 'js/main.js',
}, },
'module-js': { 'module-js': {
......
...@@ -3,16 +3,18 @@ bind_edit_links = -> ...@@ -3,16 +3,18 @@ bind_edit_links = ->
edit_item($(this).attr('id')) edit_item($(this).attr('id'))
return false return false
edit_item = (id) -> edit_item = (id) =>
$.get('/edit_item', {id: id}, (data) -> $.get('/edit_item', {id: id}, (data) =>
$('#module-html').empty().append(data) $('#module-html').empty().append(data)
bind_edit_links() bind_edit_links()
$('section.edit-pane').show() $('section.edit-pane').show()
$('body').addClass('content') $('body').addClass('content')
new window[$('#unit-wrapper').attr('class')] 'module-html' new @Unit('unit-wrapper', id)
) )
$ -> $ ->
$.ajaxSetup
headers : { 'X-CSRFToken': $.cookie 'csrftoken' }
$('section.main-content').children().hide() $('section.main-content').children().hide()
$('.editable').inlineEdit() $('.editable').inlineEdit()
$('.editable-textarea').inlineEdit({control: 'textarea'}) $('.editable-textarea').inlineEdit({control: 'textarea'})
......
class @Unit
constructor: (@element_id, @module_id) ->
@module = new window[$("##{@element_id}").attr('class')] 'module-html'
$("##{@element_id} .save-update").click( (event) =>
event.preventDefault()
$.post("save_item", {
id: @module_id
data: JSON.stringify(@module.save())
})
)
/*!
* jQuery Cookie Plugin
* https://github.com/carhartl/jquery-cookie
*
* Copyright 2011, Klaus Hartl
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://www.opensource.org/licenses/mit-license.php
* http://www.opensource.org/licenses/GPL-2.0
*/
(function($) {
$.cookie = function(key, value, options) {
// key and at least value given, set cookie...
if (arguments.length > 1 && (!/Object/.test(Object.prototype.toString.call(value)) || value === null || value === undefined)) {
options = $.extend({}, options);
if (value === null || value === undefined) {
options.expires = -1;
}
if (typeof options.expires === 'number') {
var days = options.expires, t = options.expires = new Date();
t.setDate(t.getDate() + days);
}
value = String(value);
return (document.cookie = [
encodeURIComponent(key), '=', options.raw ? value : encodeURIComponent(value),
options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
options.path ? '; path=' + options.path : '',
options.domain ? '; domain=' + options.domain : '',
options.secure ? '; secure' : ''
].join(''));
}
// key and possibly options given, get cookie...
options = value || {};
var decode = options.raw ? function(s) { return s; } : decodeURIComponent;
var pairs = document.cookie.split('; ');
for (var i = 0, pair; pair = pairs[i] && pairs[i].split('='); i++) {
if (decode(pair[0]) === key) return decode(pair[1] || ''); // IE saves cookies with empty string as "c; ", e.g. without "=" as opposed to EOMB, thus pair[1] may be undefined
}
return null;
};
})(jQuery);
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
<%static:js group='module-js'/> <%static:js group='module-js'/>
<script src="${ STATIC_URL }/js/jquery.inlineedit.js"></script> <script src="${ STATIC_URL }/js/jquery.inlineedit.js"></script>
<script src="${ STATIC_URL }/js/jquery.cookie.js"></script>
<script src="${ STATIC_URL }/js/jquery.leanModal.min.js"></script> <script src="${ STATIC_URL }/js/jquery.leanModal.min.js"></script>
<script src="${ STATIC_URL }/js/jquery.tablednd.js"></script> <script src="${ STATIC_URL }/js/jquery.tablednd.js"></script>
</body> </body>
......
...@@ -7,4 +7,5 @@ from django.conf.urls.defaults import patterns, url ...@@ -7,4 +7,5 @@ from django.conf.urls.defaults import patterns, url
urlpatterns = patterns('', urlpatterns = patterns('',
url(r'^$', 'contentstore.views.index', name='index'), url(r'^$', 'contentstore.views.index', name='index'),
url(r'^edit_item$', 'contentstore.views.edit_item', name='edit_item'), url(r'^edit_item$', 'contentstore.views.edit_item', name='edit_item'),
url(r'^save_item$', 'contentstore.views.save_item', name='save_item'),
) )
class @HTML class @HTML
constructor: (@id) -> constructor: (@id) ->
id = @id @edit_box = $("##{@id} .edit-box")
$("##{id} .edit-box").on('input', -> @preview = $("##{@id} .preview")
$("##{id} .preview").empty().append($(this).val()) @edit_box.on('input', =>
@preview.empty().append(@edit_box.val())
) )
save: -> $("##{@id} .edit-box").val() save: -> {text: @edit_box.val()}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment