Commit 3073110c by Piotr Mitros

rename xoncept to concept. More traditional name is nicer

parent 2602b476
from .concept import ConceptXBlock
......@@ -9,9 +9,9 @@ from xblock.fields import Scope, Integer, String
from xblock.fragment import Fragment
class XonceptXBlock(XBlock):
class ConceptXBlock(XBlock):
"""
This XBlock will play an MP3 file as an HTML5 Xoncept element.
This XBlock allows concept tagging in a course.
"""
# Fields are defined on the class. You can access them in your code as
......@@ -49,24 +49,24 @@ class XonceptXBlock(XBlock):
# TO-DO: change this view to display your data your own way.
def student_view(self, context=None):
"""
The primary view of the XonceptXBlock, shown to students
The primary view of the ConceptXBlock, shown to students
when viewing courses.
"""
print "HERE", self.concept_map
html = self.resource_string("static/html/xoncept.html")#.replace("PLACEHOLDER_FOR_CONCEPT_MAP",json.dumps(self.concept_map))
html = self.resource_string("static/html/concept.html")#.replace("PLACEHOLDER_FOR_CONCEPT_MAP",json.dumps(self.concept_map))
#print self.server
#print html.format
cm = self.concept_map
print "Read", cm
frag = Fragment(html.replace("PLACEHOLDER_FOR_CONCEPT_MAP",cm).replace("SERVER", self.server)) #)#format(server = self.server, concept_map = cm))
frag.add_css_url("https://ajax.googleapis.com/ajax/libs/jqueryui/1.10.4/themes/smoothness/jquery-ui.css")
frag.add_css(self.resource_string("static/css/xoncept.css"))
frag.add_css(self.resource_string("static/css/concept.css"))
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.add_javascript(self.resource_string("static/js/concept.js"))
frag.initialize_js('ConceptXBlock')
print self.xml_text_content()
......@@ -78,9 +78,9 @@ class XonceptXBlock(XBlock):
def workbench_scenarios():
"""A canned scenario for display in the workbench."""
return [
("XonceptXBlock",
("ConceptXBlock",
"""<vertical_demo>
<Xoncept server="http://pmitros.edx.org:8000/"> </Xoncept>
<Concept server="http://pmitros.edx.org:8000/"> </Concept>
</vertical_demo>
"""),
]
"""Setup for xoncept XBlock."""
"""Setup for concept XBlock."""
import os
from setuptools import setup
......@@ -15,19 +15,19 @@ def package_data(pkg, root):
setup(
name='xoncept-xblock',
name='concept-xblock',
version='0.1',
description='xoncept XBlock', # TODO: write a better description.
description='concept XBlock', # TODO: write a better description.
packages=[
'xoncept',
'concept',
],
install_requires=[
'XBlock',
],
entry_points={
'xblock.v1': [
'xoncept = xoncept:XonceptXBlock',
'concept = concept:ConceptXBlock',
]
},
package_data=package_data("xoncept", "static"),
package_data=package_data("concept", "static"),
)
from .xoncept import XonceptXBlock
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