merge ofop-red branch which should not be necessary any more

[librarian.git] / librarian / pyhtml.py

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index d868a17..6db1701 100644 (file)
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -10,7 +10,6 @@ from librarian import functions
 import re
 import random
 
-IMAGE_THUMB_WIDTH = 300
 
 class EduModule(Xmill):
     def __init__(self, options=None):
@@ -83,7 +82,10 @@ class EduModule(Xmill):
             }
         submill = EduModule(dict(self.options.items() + {'sub_gen': True}.items()))
 
-        opis = submill.generate(element.xpath('opis')[0])
+        if element.xpath('opis'):
+            opis = submill.generate(element.xpath('opis')[0])
+        else:
+            opis = ''
 
         n = element.xpath('wskazowki')
         if n: wskazowki = submill.generate(n[0])
@@ -256,45 +258,13 @@ u"""%(wskazowki)s
 
             return u"<a href='%s'>" % def_href, u'%s</a>%s' % (def_err, more_links)
 
-    def handle_obraz(self, element):
-        name = element.attrib.get('nazwa', '').strip()
-        if not name:
-            print '!! <obraz> missing "nazwa"'
-            return
-        alt = element.attrib.get('alt', '')
-        if not alt:
-            print '** <obraz> missing "alt"'
-        slug, ext = name.rsplit('.', 1)
-        url = self.options['urlmapper'].url_for_image(slug, ext)
-        thumb_url = self.options['urlmapper'].url_for_image(slug, ext, IMAGE_THUMB_WIDTH)
-        e = etree.Element("a", attrib={"href": url, "class": "image"})
-        e.append(etree.Element("img", attrib={"src": thumb_url, "alt": alt,
-                    "width": str(IMAGE_THUMB_WIDTH)}))
-        return etree.tostring(e, encoding=unicode), u""
-
-    def handle_video(self, element):
-        url = element.attrib.get('url')
-        if not url:
-            print '!! <video> missing url'
-            return
-        m = re.match(r'(?:https?://)?(?:www.)?youtube.com/watch\?(?:.*&)?v=([^&]+)(?:$|&)', url)
-        if not m:
-            print '!! unknown <video> url scheme:', url
-            return
-        return """<iframe width="630" height="384" src="http://www.youtube.com/embed/%s"
-            frameborder="0" allowfullscreen></iframe>""" % m.group(1), ""
-
 
 class Exercise(EduModule):
-    INSTRUCTION = ""
     def __init__(self, *args, **kw):
         self.question_counter = 0
         super(Exercise, self).__init__(*args, **kw)
-        self.instruction_printed = False
 
-    @tagged('div', 'description')
-    def handle_opis(self, element):
-        return "", self.get_instruction()
+    handle_opis = tag('div', 'description')
 
     def handle_rozw_kom(self, element):
         return u"""<div style="display:none" class="comment">""", u"""</div>"""
@@ -358,17 +328,8 @@ class Exercise(EduModule):
             (add_class, self.question_counter, solution_s + minimum_s), \
             "</div>"
 
-    def get_instruction(self):
-        if not self.instruction_printed:
-            self.instruction_printed = True
-            return u'<span class="instruction">%s</span>' % self.INSTRUCTION
-        else:
-            return ""
-
-
 
 class Wybor(Exercise):
-    INSTRUCTION = None
     def handle_cwiczenie(self, element):
         pre, post = super(Wybor, self).handle_cwiczenie(element)
         is_single_choice = True
@@ -415,8 +376,6 @@ class Wybor(Exercise):
 
 
 class Uporzadkuj(Exercise):
-    INSTRUCTION = u"Kliknij wybraną odpowiedź i przeciągnij w nowe miejsce."
-
     def handle_pytanie(self, element):
         """
 Overrides the returned content default handle_pytanie
@@ -436,7 +395,6 @@ Overrides the returned content default handle_pytanie
 
 
 class Luki(Exercise):
-    INSTRUCTION = u"Przeciągnij odpowiedzi i upuść w wybranym polu."
     def find_pieces(self, question):
         return question.xpath(".//luka")
 
@@ -472,8 +430,6 @@ class Luki(Exercise):
 
 
 class Zastap(Luki):
-    INSTRUCTION = u"Przeciągnij odpowiedzi i upuść je na słowie lub wyrażeniu, które chcesz zastąpić."
-
     def find_pieces(self, question):
         return question.xpath(".//zastap")
 
@@ -487,23 +443,6 @@ class Zastap(Luki):
 
 
 class Przyporzadkuj(Exercise):
-    INSTRUCTION = [u"Przeciągnij odpowiedzi i upuść w wybranym polu.",
-                   u"Kliknij numer odpowiedzi, przeciągnij i upuść w wybranym polu."]
-
-    def get_instruction(self):
-        if not self.instruction_printed:
-            self.instruction_printed = True
-            return u'<span class="instruction">%s</span>' % self.INSTRUCTION[self.options['handles'] and 1 or 0]
-        else:
-            return ""
-
-    def handle_cwiczenie(self, element):
-        pre, post = super(Przyporzadkuj, self).handle_cwiczenie(element)
-        lista_with_handles = element.xpath(".//*[@uchwyty]")
-        if lista_with_handles:
-            self.options = {'handles': True}
-        return pre, post
-
     def handle_pytanie(self, element):
         pre, post = super(Przyporzadkuj, self).handle_pytanie(element)
         minimum = element.attrib.get("min", None)
@@ -523,7 +462,7 @@ class Przyporzadkuj(Exercise):
                 'data-target': lista.attrib['cel'],
                 'class': 'subject'
             }
-            self.options = {'subject': True}
+            self.options = {'subject': True, 'handles': 'uchwyty' in lista.attrib}
         else:
             attrs = {}
         pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs)
@@ -542,7 +481,7 @@ class Przyporzadkuj(Exercise):
                 placeholders = u'<li class="placeholder"/>' * self.options['min']
             else:
                 placeholders = u'<li class="placeholder multiple"/>'
-            return '<li data-predicate="%(nazwa)s">' % element.attrib, '<ul class="subjects">' + placeholders + '</ul></li>'
+            return '<li data-predicate="%(nazwa)s">' % element.attrib, '<ul>' + placeholders + '</ul></li>'
 
         else:
             return super(Przyporzadkuj, self).handle_punkt(element)
@@ -598,9 +537,6 @@ class EduModuleFormat(Format):
     def url_for_material(self, slug, fmt):
         return "%s.%s" % (slug, fmt)
 
-    def url_for_image(self, slug, fmt, width=None):
-        return self.url_for_material(self, slug, fmt)
-
 
 def transform(wldoc, stylesheet='edumed', options=None, flags=None):
     """Transforms the WL document to XHTML.