Vertical Module is now an x_module

courseware/modules/capa_module.py

@@ -108,8 +108,8 @@ class LoncapaModule(XModule):
             
         return html
 
-    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None):
-        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function)
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None, meta = None):
+        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function)
 
         self.attempts = 0
         self.max_attempts = None

courseware/modules/html_module.py

@@ -25,8 +25,8 @@ class HtmlModule(XModule):
             textlist=[i for i in textlist if type(i)==str]
             return "".join(textlist)
 
-    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None):
-        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function)
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None, meta = None):
+        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function)
         xmltree=etree.fromstring(xml)
         self.filename = None
         filename_l=xmltree.xpath("/html/@filename")

courseware/modules/schematic_module.py

@@ -18,6 +18,6 @@ class SchematicModule(XModule):
     def get_html(self):
         return '<input type="hidden" class="schematic" name="{item_id}" height="480" width="640">'.format(item_id=self.item_id)
 
-    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None):
-        XModule.__init__(self, xml, item_id, ajax_url, track_url, state)
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, render_function = None, meta = None):
+        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, render_function)
 

courseware/modules/vertical_module.py

@@ -0,0 +1,39 @@
+from x_module import XModule
+from lxml import etree
+
+import json
+
+## TODO: Abstract out from Django
+from django.conf import settings
+from djangomako.shortcuts import render_to_response, render_to_string
+
+class VerticalModule(XModule):
+    id_attribute = 'id'
+
+    def get_state(self):
+        return json.dumps({ })
+
+    def get_xml_tags():
+        return "vertical"
+        
+    def get_html(self):
+        return render_to_string('vert_module.html',{'items':self.contents})
+
+    def get_init_js(self):
+        return self.init_js_text
+
+    def get_destroy_js(self):
+        return self.destroy_js_text
+
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None, meta = None):
+        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function)
+        xmltree=etree.fromstring(xml)
+        self.filename = None
+        filename_l=xmltree.xpath("/html/@filename")
+        if len(filename_l)>0:
+            self.filename=str(filename_l[0])
+
+        self.contents=[(e.get("name"),self.render_function(meta, e)) \
+                      for e in xmltree]
+        self.init_js_text="".join([e[1]['init_js'] for e in self.contents if 'init_js' in e[1]])
+        self.destroy_js_text="".join([e[1]['destroy_js'] for e in self.contents if 'destroy_js' in e[1]])

courseware/modules/video_module.py

@@ -46,8 +46,8 @@ class VideoModule(XModule):
     def get_destroy_js(self):
         return "videoDestroy();"
 
-    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None):
-        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function)
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None, meta = None):
+        XModule.__init__(self, xml, item_id, ajax_url, track_url, state, track_function, render_function)
         print state
         if state!=None and "time" not in json.loads(state):
             self.video_time = 0

courseware/modules/x_module.py

@@ -39,11 +39,13 @@ class XModule(object):
             get is a dictionary-like object ''' 
         return ""
 
-    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None):
+    def __init__(self, xml, item_id, ajax_url=None, track_url=None, state=None, track_function=None, render_function = None, meta = None):
         ''' In most cases, you must pass state or xml'''
-        self.xml=xml
-        self.item_id=item_id
-        self.ajax_url=ajax_url
-        self.track_url=track_url
-        self.state=state
-        self.tracker=track_function
+        self.xml = xml
+        self.item_id = item_id
+        self.ajax_url = ajax_url
+        self.track_url = track_url
+        self.state = state
+        self.tracker = track_function
+        self.render_function = render_function
+        self.meta = meta