student-teacher customization

[librarian.git] / librarian / pyhtml.py

diff --git a/librarian/pyhtml.py b/librarian/pyhtml.py
index 33d6d9e..6d1e914 100644 (file)
--- a/librarian/pyhtml.py
+++ b/librarian/pyhtml.py
@@ -9,7 +9,9 @@ from xmlutils import Xmill, tag, tagged, ifoption, tag_open_close
 from librarian import functions
 import re
 import random
 from librarian import functions
 import re
 import random

+from copy import deepcopy

 
 

+IMAGE_THUMB_WIDTH = 300

 
 class EduModule(Xmill):
     def __init__(self, options=None):
 
 class EduModule(Xmill):
     def __init__(self, options=None):


@@ -65,11 +67,12 @@ class EduModule(Xmill):
             toc.append("<li>%s</li>" % atxt)
         toc = "<ul class='toc'>%s</ul>" % "".join(toc)
         add_header = "Lekcja: " if self.options['wldoc'].book_info.type in ('course', 'synthetic') else ''
             toc.append("<li>%s</li>" % atxt)
         toc = "<ul class='toc'>%s</ul>" % "".join(toc)
         add_header = "Lekcja: " if self.options['wldoc'].book_info.type in ('course', 'synthetic') else ''

-        return "<h1 class='title'>%s" % add_header, "</h1>" + toc
+        return "<h1 class='title'><a name='top'></a>%s" % add_header, "</h1>" + toc

 
 

-    @tagged("h2")

     def handle_naglowek_rozdzial(self, element):
     def handle_naglowek_rozdzial(self, element):

-        return "", "".join(tag_open_close("a", name=self.naglowek_to_anchor(element)))
+        return_to_top = u"<a href='#top' class='top-link'>wróć do spisu treści</a>"
+        anchor = "".join(tag_open_close("a", name=self.naglowek_to_anchor(element)))
+        return return_to_top + "<h2>", anchor + "</h2>"

 
     def handle_uwaga(self, _e):
         return None
 
     def handle_uwaga(self, _e):
         return None


@@ -255,12 +258,28 @@ u"""%(wskazowki)s
 
             return u"<a href='%s'>" % def_href, u'%s</a>%s' % (def_err, more_links)
 
 
             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
     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)
+        m = re.match(r'(?:https?://)?(?:www.)?youtube.com/watch\?(?:.*&)?v=([^&]+)(?:$|&)', url)

         if not m:
             print '!! unknown <video> url scheme:', url
             return
         if not m:
             print '!! unknown <video> url scheme:', url
             return


@@ -269,11 +288,15 @@ u"""%(wskazowki)s
 
 
 class Exercise(EduModule):
 
 
 class Exercise(EduModule):

+    INSTRUCTION = ""

     def __init__(self, *args, **kw):
         self.question_counter = 0
         super(Exercise, self).__init__(*args, **kw)
     def __init__(self, *args, **kw):
         self.question_counter = 0
         super(Exercise, self).__init__(*args, **kw)

+        self.instruction_printed = False

 
 

-    handle_opis = tag('div', 'description')
+    @tagged('div', 'description')
+    def handle_opis(self, element):
+        return "", self.get_instruction()

 
     def handle_rozw_kom(self, element):
         return u"""<div style="display:none" class="comment">""", u"""</div>"""
 
     def handle_rozw_kom(self, element):
         return u"""<div style="display:none" class="comment">""", u"""</div>"""


@@ -337,6 +360,17 @@ class Exercise(EduModule):
             (add_class, self.question_counter, solution_s + minimum_s), \
             "</div>"
 
             (add_class, self.question_counter, solution_s + minimum_s), \
             "</div>"
 

+    def get_instruction(self):
+        if not self.instruction_printed:
+            self.instruction_printed = True
+            if self.INSTRUCTION:
+                return u'<span class="instruction">%s</span>' % self.INSTRUCTION
+            else:
+                return ""
+        else:
+            return ""
+
+

 
 class Wybor(Exercise):
     def handle_cwiczenie(self, element):
 
 class Wybor(Exercise):
     def handle_cwiczenie(self, element):


@@ -385,6 +419,8 @@ class Wybor(Exercise):
 
 
 class Uporzadkuj(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
     def handle_pytanie(self, element):
         """
 Overrides the returned content default handle_pytanie


@@ -404,16 +440,15 @@ Overrides the returned content default handle_pytanie
 
 
 class Luki(Exercise):
 
 
 class Luki(Exercise):

+    INSTRUCTION = u"Przeciągnij odpowiedzi i upuść w wybranym polu."

     def find_pieces(self, question):
         return question.xpath(".//luka")
 
     def solution_html(self, piece):
     def find_pieces(self, question):
         return question.xpath(".//luka")
 
     def solution_html(self, piece):

+        piece = deepcopy(piece)
+        piece.tail = None

         sub = EduModule()
         return sub.generate(piece)
         sub = EduModule()
         return sub.generate(piece)

-        # print piece.text
-        # return piece.text + ''.join(
-        #     [etree.tostring(n, encoding=unicode)
-        #      for n in piece])

 
     def handle_pytanie(self, element):
         qpre, qpost = super(Luki, self).handle_pytanie(element)
 
     def handle_pytanie(self, element):
         qpre, qpost = super(Luki, self).handle_pytanie(element)


@@ -439,6 +474,8 @@ class Luki(Exercise):
 
 
 class Zastap(Luki):
 
 
 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")
 
     def find_pieces(self, question):
         return question.xpath(".//zastap")
 


@@ -452,6 +489,23 @@ class Zastap(Luki):
 
 
 class Przyporzadkuj(Exercise):
 
 
 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)
     def handle_pytanie(self, element):
         pre, post = super(Przyporzadkuj, self).handle_pytanie(element)
         minimum = element.attrib.get("min", None)


@@ -471,7 +525,7 @@ class Przyporzadkuj(Exercise):
                 'data-target': lista.attrib['cel'],
                 'class': 'subject'
             }
                 'data-target': lista.attrib['cel'],
                 'class': 'subject'
             }

-            self.options = {'subject': True, 'handles': 'uchwyty' in lista.attrib}
+            self.options = {'subject': True}

         else:
             attrs = {}
         pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs)
         else:
             attrs = {}
         pre, post = super(Przyporzadkuj, self).handle_lista(lista, attrs)


@@ -546,6 +600,9 @@ class EduModuleFormat(Format):
     def url_for_material(self, slug, fmt):
         return "%s.%s" % (slug, fmt)
 
     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.
 
 def transform(wldoc, stylesheet='edumed', options=None, flags=None):
     """Transforms the WL document to XHTML.