Skip to content

C
ConceptXBlock
Commit 2e4c7ace by Piotr Mitros
Options

Finished renaming

parent f6498108
Showing with 18 additions and 13 deletions
xoncept/static/html/sample.html → xoncept/static/html/xoncept.html
<!doctype html> <!--!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
...@@ -7,16 +7,16 @@ ...@@ -7,16 +7,16 @@
<script src="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.3.0.js"> </script> <script src="http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.3.0.js"> </script>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
<link rel="stylesheet" href="sample.css" /> <link rel="stylesheet" href="xoncept.css" /-->
<script id="lo-template" type="text/x-handlebars-template"> <script id="lo-template" type="text/x-handlebars-template">
<div class="lo_drag" style="border:1px solid #DDDDDD; width:200px; height:55px; display:inline-block; background-color: #FCFCFC; border-radius: 3px; padding:0px"> <div class="lo_drag" style="border:1px solid #DDDDDD; width:200px; height:55px; display:inline-block; background-color: #FCFCFC; border-radius: 3px; padding:0px">
<div style="block;background-color: #F0F0F0; height:20px; padding:3px;"> <div style="block;background-color: #F0F0F0; height:20px; padding:3px;">
<div class="obj_title"> {{title}} </div> <div class="obj_title"> {{{{title}}}} </div>
<div class="obj_icons"> <a href="/wiki/{{title}}"><span style="display:inline-block;" class="ui-icon ui-icon-pencil"></span></a> <span style="display:inline-block;" class="ui-icon ui-icon-close lo_close"></span> </div> <div class="obj_icons"> <a href="/wiki/{{{{title}}}}"><span style="display:inline-block;" class="ui-icon ui-icon-pencil"></span></a> <span style="display:inline-block;" class="ui-icon ui-icon-close lo_close"></span> </div>
</div> </div>
<div class="objective_desc"> <div class="objective_desc">
{{render}} {{{{render}}}}
</div> </div>
</div> </div>
</script> </script>
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
</body> </body>
<script type="text/javascript" src="sample.js"> <!--script type="text/javascript" src="sample.js">
</script> </script>
</html> <!--/html-->
xoncept/xoncept.py
...@@ -30,13 +30,20 @@ class XonceptXBlock(XBlock): ...@@ -30,13 +30,20 @@ class XonceptXBlock(XBlock):
The primary view of the XonceptXBlock, shown to students The primary view of the XonceptXBlock, shown to students
when viewing courses. when viewing courses.
""" """
html = self.resource_string("static/html/Xoncept.html") html = self.resource_string("static/html/xoncept.html")
print self.src print self.src
print html.format print html.format
frag = Fragment(html.format(src = self.src)) frag = Fragment(html.format(src = self.src))
frag.add_css(self.resource_string("static/css/Xoncept.css")) frag.add_css_url("https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.css")
frag.add_javascript(self.resource_string("static/js/src/Xoncept.js")) frag.add_css(self.resource_string("static/css/xoncept.css"))
frag.initialize_js('XonceptXBlock')
frag.add_javascript_url("http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.3.0.js")
# frag.add_javascript_url("https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js")
frag.add_javascript_url("https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/jquery-ui.min.js")
frag.add_javascript(self.resource_string("static/js/xoncept.js"))
#frag.initialize_js('XonceptXBlock')
print self.xml_text_content() print self.xml_text_content()
return frag return frag
...@@ -49,8 +56,6 @@ class XonceptXBlock(XBlock): ...@@ -49,8 +56,6 @@ class XonceptXBlock(XBlock):
("XonceptXBlock", ("XonceptXBlock",
"""<vertical_demo> """<vertical_demo>
<Xoncept src="http://localhost/Ikea.mp3"> </Xoncept> <Xoncept src="http://localhost/Ikea.mp3"> </Xoncept>
<Xoncept src="http://localhost/skull.mp3"> </Xoncept>
<Xoncept src="http://localhost/monkey.mp3"> </Xoncept>
</vertical_demo> </vertical_demo>
"""), """),
] ]
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