lino 25.8.2__py3-none-any.whl → 25.9.0__py3-none-any.whl

lino/modlib/users/models.py

@@ -476,43 +476,44 @@ if dd.plugins.users.allow_online_registration:
     About.create_account = CreateAccount()
 
 
-@dd.receiver(dd.post_startup)
-def setup_memo_commands(sender=None, **kwargs):
-    # See :doc:`/specs/memo`
-
-    if not sender.is_installed("memo"):
-        return
-
-    mp = sender.plugins.memo.parser
-    mp.add_suggester(
-        "@",
-        sender.models.users.User.objects.filter(username__isnull=False).order_by(
-            "username"
-        ),
-        "username",
-    )
+if dd.is_installed("memo"):
 
+    @dd.receiver(dd.post_startup)
+    def setup_memo_commands(sender=None, **kwargs):
+        # See :doc:`/specs/memo`
 
-def welcome_messages(ar):
-    me = ar.get_user()
-    if not me.is_verified():
-        # sar = rt.models.users.Me.create_request(parent=ar)
-        sar = ar
-        if me.email:
-            # verify_me =
-            msg = format_html(
-                _("Your email address ({email}) is not verified, "
-                  "please check your mailbox and {verify} or {resend}."),
-                email=me.email,
-                verify=tostring(sar.instance_action_button(
-                    me.verify_me, _("verify now"))),
-                resend=tostring(sar.instance_action_button(
-                    me.send_welcome_email, _("re-send our welcome email"))))
-        else:
-            msg = format_html(
-                _("You have no email address, please {edit}."),
-                edit=tostring(sar.obj2html(me, _("edit your user settings"))))
-        yield mark_safe(msg)
+        # if not sender.is_installed("memo"):
+        #     return
 
+        mp = sender.plugins.memo.parser
+        mp.add_suggester(
+            "@",
+            sender.models.users.User.objects.filter(
+                username__isnull=False).order_by("username"),
+            "username")
+
+
+if dd.plugins.users.allow_online_registration:
 
-dd.add_welcome_handler(welcome_messages)
+    def welcome_messages(ar):
+        me = ar.get_user()
+        if not me.is_verified():
+            # sar = rt.models.users.Me.create_request(parent=ar)
+            sar = ar
+            if me.email:
+                # verify_me =
+                msg = format_html(
+                    _("Your email address ({email}) is not verified, "
+                      "please check your mailbox and {verify} or {resend}."),
+                    email=me.email,
+                    verify=tostring(sar.instance_action_button(
+                        me.verify_me, _("verify now"))),
+                    resend=tostring(sar.instance_action_button(
+                        me.send_welcome_email, _("re-send our welcome email"))))
+            else:
+                msg = format_html(
+                    _("You have no email address, please {edit}."),
+                    edit=tostring(sar.obj2html(me, _("edit your user settings"))))
+            yield mark_safe(msg)
+
+    dd.add_welcome_handler(welcome_messages)

lino/modlib/weasyprint/__init__.py

@@ -34,6 +34,8 @@ class Plugin(ad.Plugin):
     top_right_width = None
     page_background_image = None
     top_right_image = None
+    bottom_left_image = None
+    bottom_left_width = None
     header_image = None
     margin = 10
     margin_left = 17
@@ -53,25 +55,34 @@ class Plugin(ad.Plugin):
             yield 'django-bulma'
 
     def pre_site_startup(self, site):
+        fcf = site.confdirs.find_config_file
         for ext in ("jpg", "png"):
-            if self.header_height:
-                fn = site.confdirs.find_config_file("top-right." + ext, "weasyprint")
-                if fn:
+            if self.bottom_left_image is None:
+                if fn := fcf("bottom-left." + ext, "weasyprint"):
+                    self.bottom_left_image = fn
+            if self.top_right_image is None:
+                if fn := fcf("top-right." + ext, "weasyprint"):
                     self.top_right_image = fn
-                    if self.top_right_width is None:
-                        if imagesize is None:
-                            site.logger.warning("imagesize is not installed")
-                            continue
-                        w, h = imagesize.get(fn)
-                        self.top_right_width = self.header_height * w / h
-                fn = site.confdirs.find_config_file("header." + ext, "weasyprint")
-                if fn:
+            if self.header_image is None:
+                if fn := fcf("header." + ext, "weasyprint"):
                     # site.logger.info("Found header_image %s", fn)
                     self.header_image = fn
             if self.page_background_image is None:
-                fn = site.confdirs.find_config_file(
-                    "page-background." + ext, "weasyprint")
-                if fn:
+                if fn := fcf("page-background." + ext, "weasyprint"):
                     # site.logger.info("Found page_background_image %s", fn)
                     self.page_background_image = fn
+        if self.header_height:
+            if self.top_right_image and not self.top_right_width:
+                # if imagesize is None:
+                #     site.logger.warning("imagesize is not installed")
+                #     continue
+                w, h = imagesize.get(self.top_right_image)
+                self.top_right_width = self.header_height * w / h
+        if self.footer_height:
+            if self.bottom_left_image and not self.bottom_left_width:
+                # if imagesize is None:
+                #     site.logger.warning("imagesize is not installed")
+                #     continue
+                w, h = imagesize.get(self.bottom_left_image)
+                self.bottom_left_width = self.footer_height * w / h
         super().pre_site_startup(site)

lino/modlib/weasyprint/choicelists.py

@@ -14,6 +14,12 @@ except ImportError:
 BULMA_CSS = None
 
 if dd.plugins.weasyprint.with_bulma:
+
+    # Bulma causes weayprint to issue many warnings, more than 2000 during one
+    # tested doc. So we deactivate them:
+    from weasyprint.logger import LOGGER, logging
+    LOGGER.setLevel(logging.ERROR)
+
     try:
         from pathlib import Path
         import bulma

lino/modlib/weasyprint/config/weasyprint/base.weasy.html

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+{%- set WP = dd.plugins.weasyprint %}
 {%- block head %}
 <meta charset="UTF-8">
 <style type="text/css">
@@ -58,7 +59,7 @@ p {
 }
 
 div.recipient {
-    position:relative; left:{{100-dd.plugins.weasyprint.margin_left}}mm;
+    position:relative; left:{{100-WP.margin_left}}mm;
     height:30mm;
     width:80mm;
     border: 1px solid lightgray;
@@ -80,25 +81,50 @@ div.recipient {
 
 @page {
     size: {%- block pagesize %}landscape{%- endblock %};
-    margin: {{dd.plugins.weasyprint.margin}}mm;
-    margin-bottom: {{dd.plugins.weasyprint.margin+dd.plugins.weasyprint.footer_height}}mm;
-    {%- if True or dd.plugins.weasyprint.top_right_image -%}
-    margin-top: {{dd.plugins.weasyprint.margin+dd.plugins.weasyprint.header_height}}mm;
+    margin: {{WP.margin}}mm;
+    margin-bottom: {{WP.margin+WP.footer_height}}mm;
+    {%- if True or WP.top_right_image -%}
+    margin-top: {{WP.margin+WP.header_height}}mm;
     {%- endif -%}
-    margin-left: {{dd.plugins.weasyprint.margin_left}}mm;
-    margin-right: {{dd.plugins.weasyprint.margin_right}}mm;
-    {%- if dd.plugins.weasyprint.page_background_image -%}
-      background-image: url(file://{{dd.plugins.weasyprint.page_background_image}});
+    margin-left: {{WP.margin_left}}mm;
+    margin-right: {{WP.margin_right}}mm;
+    {%- if WP.page_background_image -%}
+      background-image: url(file://{{WP.page_background_image}});
       background-repeat: no-repeat;
       background-attachment: fixed;
       background-size: contain;
     {%- endif -%}
     font-family: "Liberation sans", "arial";
     font-size: 10pt;
+
+    {%- block topright %}
+    {% if WP.top_right_image %}
+    @top-right {
+      height: {{WP.header_height}}mm;
+      width: {{WP.top_right_width}}mm;
+      padding: 0mm;
+      text-align: right;
+      background-image: url(file://{{WP.top_right_image}});
+      background-size: cover;
+      content: "";  // may be empty but must exist, otherwise bg is not rendered
+      // content: url(file://{{WP.top_right_image}});
+    }
+    {% endif %}
+    {%- endblock topright %}
     {%- block bottomleft %}
     @bottom-left {
+      {% if WP.bottom_left_image %}
+        height: {{WP.footer_height}}mm;
+        width: {{WP.bottom_left_width}}mm;
+        padding: 0mm;
+        text-align: right;
+        background-image: url(file://{{WP.bottom_left_image}});
+        background-size: cover;
+        content: "";  // may be empty but must exist, otherwise bg is not rendered
+      {% else %}
         vertical-align: top;
         content: '{{_("Printed")}} {{fdm(dd.today())}} {{_("at")}} {{now.time().strftime("%H:%M")}}';
+      {% endif %}
     }
     {%- endblock bottomleft %}
     {%- block bottomright %}
@@ -107,21 +133,6 @@ div.recipient {
         content: '{{_("Page")}} ' counter(page) ' {{_("of {0}").format("")}} ' counter(pages);
     }
     {%- endblock bottomright %}
-
-    {%- block topright %}
-    {% if dd.plugins.weasyprint.top_right_image %}
-    @top-right {
-      height: {{dd.plugins.weasyprint.header_height}}mm;
-      width: {{dd.plugins.weasyprint.top_right_width}}mm;
-      padding: 0mm;
-      text-align: right;
-      background-image: url(file://{{dd.plugins.weasyprint.top_right_image}});
-      background-size: cover;
-      content: "";  // may be empty but must exist, otherwise bg is not rendered
-      // content: url(file://{{dd.plugins.weasyprint.top_right_image}});
-    }
-    {% endif %}
-    {%- endblock topright %}
 }
 
 @media print {
@@ -142,7 +153,7 @@ div.recipient {
     div.footer_div {
         position: fixed;
         // bottom: -5mm;
-        bottom: -{{dd.plugins.weasyprint.footer_height}}mm;
+        bottom: -{{WP.footer_height}}mm;
         width: 100%;
         // border-top: solid 1pt;
         padding: 0;
@@ -164,9 +175,14 @@ div.recipient {
 </head>
 <body>
 {%- block header %}
-{% if dd.plugins.weasyprint.header_image %}
+{% if WP.header_image %}
 <div class="header_div">
-<img src="file://{{dd.plugins.weasyprint.header_image}}" style="height:{{dd.plugins.weasyprint.header_height}}mm">
+<img src="file://{{WP.header_image}}" style="height:{{WP.header_height}}mm">
+</div>
+{% endif %}
+{% if WP.footer_image %}
+<div class="footer_div">
+<img src="file://{{WP.footer_image}}" style="height:{{WP.footer_height}}mm">
 </div>
 {% endif %}
 {%- endblock header %}

lino/utils/diag.py

@@ -144,14 +144,14 @@ class Analyzer(object):
 
         return rstgen.ul(items)
 
-    def show_database_structure(self, sort_fields=False, sort_models=True, verbose_names=False):
+    def show_db_structure(self, sort_fields=False, sort_models=True, verbose_names=False):
         """Show a bullet list of all models and their fields.
 
         Both the list of models and the fields of each model can optionally be
         sorted alphabetically. The models are sorted by default, the fields not.
 
         """
-        self.analyze()
+        # self.analyze()
         items = []
         for model in get_models():
             # names = []
@@ -170,7 +170,9 @@ class Analyzer(object):
 
         if sort_models:
             items = sorted(items)
-        return rstgen.ul(items)
+        print(rstgen.ul(items))
+
+    show_database_structure = show_db_structure
 
     def show_fields(self, model, field_names=None, languages=None):
         model = dd.resolve_model(model)

lino/utils/html.py

@@ -8,6 +8,7 @@ Some HTML utilities for Lino.
 import types
 from lxml import etree
 from etgen.html import E, to_rst, fromstring, iselement, join_elems, forcetext, lines2p
+from etgen import html as xghtml
 
 # from etgen.html import tostring as et_tostring
 from html2text import HTML2Text
@@ -15,6 +16,7 @@ from django.utils.html import SafeString, mark_safe, escape, format_html
 # from lino.utils import tostring
 
 SAFE_EMPTY = mark_safe("")
+PLAIN_PAGE_LENGTH = 15
 
 
 def html2text(html, **kwargs):
@@ -108,3 +110,104 @@ class Grouper:
             return SAFE_EMPTY
         self.last_values = self.current_values
         return self.ar.actor.after_group_change(self, obj)
+
+
+def table2html(ar, as_main=True):
+    """Represent the given table request as an HTML table.
+
+    `ar` is the request to be rendered, an instance of
+    :class:`lino.core.requests.ActionRequest`.
+
+    The returned HTML enclosed in a ``<div>`` tag and generated using
+    :mod:`etgen.html`.
+
+    If `as_main` is True, include additional elements such as a paging
+    toolbar. (This argument is currently being ignored.)
+
+    """
+    # as_main = True
+    t = xghtml.Table()
+    t.attrib.update(**{"class": "table table-striped table-hover"})
+    if ar.limit is None:
+        ar.limit = PLAIN_PAGE_LENGTH
+    pglen = ar.limit
+    if ar.offset is None:
+        page = 1
+    else:
+        """
+        (assuming pglen is 5)
+        offset page
+        0      1
+        5      2
+        """
+        page = int(old_div(ar.offset, pglen)) + 1
+
+    ar.dump2html(t, ar.sliced_data_iterator, header_links=as_main)
+    if not as_main:
+        url = ar.get_request_url() or "#"  # open in own window
+        return E.div(
+            E.div(
+                E.div(
+                    E.a(
+                        E.span(**{"class": "glyphicon glyphicon-folder-open"}),
+                        href=url,
+                        style="margin-left: 4px;",
+                        **{"class": "btn btn-default pull-right"},
+                    ),
+                    E.h5(str(ar.get_title()), style="display: inline-block;"),
+                    **{"class": "panel-title"},
+                ),
+                **{"class": "panel-heading"},
+            ),
+            t.as_element(),
+            style="display: inline-block;",
+            **{"class": "panel panel-default"},
+        )
+
+    buttons = []
+    kw = dict()
+    kw = {}
+    if pglen != PLAIN_PAGE_LENGTH:
+        kw[constants.URL_PARAM_LIMIT] = pglen
+
+    if page > 1:
+        kw[constants.URL_PARAM_START] = pglen * (page - 2)
+        prev_url = ar.get_request_url(**kw)
+        kw[constants.URL_PARAM_START] = 0
+        first_url = ar.get_request_url(**kw)
+    else:
+        prev_url = None
+        first_url = None
+    buttons.append(("<<", _("First page"), first_url))
+    buttons.append(("<", _("Previous page"), prev_url))
+
+    next_start = pglen * page
+    if next_start < ar.get_total_count():
+        kw[constants.URL_PARAM_START] = next_start
+        next_url = ar.get_request_url(**kw)
+        last_page = int(old_div((ar.get_total_count() - 1), pglen))
+        kw[constants.URL_PARAM_START] = pglen * last_page
+        last_url = ar.get_request_url(**kw)
+    else:
+        next_url = None
+        last_url = None
+    buttons.append((">", _("Next page"), next_url))
+    buttons.append((">>", _("Last page"), last_url))
+
+    return E.div(buttons2pager(buttons), t.as_element())
+
+
+def layout2html(ar, elem):
+    wl = ar.bound_action.get_window_layout()
+    if wl is None:
+        raise Exception("{!r} has no window layout".format(ar.bound_action))
+    # ~ print 20120901, wl.main
+    lh = wl.get_layout_handle()
+
+    items = list(lh.main.as_plain_html(ar, elem))
+    # if navigator:
+    #     items.insert(0, navigator)
+    # ~ print tostring(E.div())
+    # ~ if len(items) == 0: return ""
+    return E.form(*items)
+    # ~ print 20120901, lh.main.__html__(ar)

lino/utils/mldbc/mixins.py

@@ -30,7 +30,7 @@ class BabelNamed(model.Model):
 
     """
 
-    class Meta(object):
+    class Meta:
         abstract = True
 
     name = BabelCharField(max_length=200, verbose_name=_("Designation"))
@@ -58,7 +58,7 @@ class BabelDesignated(model.Model):
 
     """
 
-    class Meta(object):
+    class Meta:
         abstract = True
 
     designation = BabelCharField(max_length=200, verbose_name=_("Designation"))

lino/utils/soup.py

@@ -22,6 +22,8 @@ from bs4 import BeautifulSoup, NavigableString, Comment, Doctype
 from django.conf import settings
 
 MORE_INDICATOR = "..."
+MORE_MARKER = "=MORE="
+DATA_UPLOAD_ID = "data-upload_id"
 
 URL_REGEX = re.compile(
     r'([^"]|^)(https?:\/\/)((www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*))'
@@ -251,10 +253,11 @@ ALLOWED_TAGS = frozenset([
 
 GENERALLY_ALLOWED_ATTRS = {"title", "style", "class"}
 
+
 # Map of allowed attributes by tag. Originally copied from bleach.sanitizer.
 ALLOWED_ATTRIBUTES = {
     "a": {"href", "target"} | GENERALLY_ALLOWED_ATTRS,
-    "img": {"src", "alt"} | GENERALLY_ALLOWED_ATTRS,
+    "img": {"src", "alt", "width", "height", DATA_UPLOAD_ID} | GENERALLY_ALLOWED_ATTRS,
 }
 
 ALLOWED_ATTRIBUTES["span"] = GENERALLY_ALLOWED_ATTRS | {
@@ -281,7 +284,7 @@ def register_sanitizer(func):
     SANITIZERS.append(func)
 
 
-def sanitized_soup(htmlstr):
+def sanitized_soup(htmlstr, save=False, ar=None, mentions=None):
     if not htmlstr.startswith("<"):
         htmlstr = f"<p>{htmlstr}</p>"
     htmlstr = url2a(htmlstr)
@@ -313,6 +316,9 @@ def sanitized_soup(htmlstr):
     for comment in comments:
         comment.extract()
 
+    for func in SANITIZERS:
+        func(soup, save=save, ar=ar, mentions=mentions)
+
     # remove the wrapper tag if it is useless
     # if len(soup.contents) == 1:
     #     main_tag = soup.contents[0]
@@ -322,22 +328,24 @@ def sanitized_soup(htmlstr):
     return soup
 
 
-def sanitize(htmlstr, save=False, ar=None):
+def sanitize(htmlstr, **kwargs):
+    # if len(chunks := htmlstr.split(MORE_MARKER, 1)) == 2:
+    #     htmlstr = " ".join(chunks)
     htmlstr = htmlstr.strip()
     if htmlstr == "":
         return htmlstr
-    soup = sanitized_soup(htmlstr)
-    for func in SANITIZERS:
-        func(soup, save=save, ar=ar)
+    soup = sanitized_soup(htmlstr, **kwargs)
     return str(soup).strip()
 
 
-def truncate_comment(htmlstr, max_length=300):
+def truncate_comment(htmlstr, max_length=300, **kwargs):
     # new implementation since 20230713
+    if len(chunks := htmlstr.split(MORE_MARKER, 1)) == 2:
+        htmlstr = chunks[0]
     htmlstr = htmlstr.strip()  # remove leading or trailing newlines
     if htmlstr == '':
         return htmlstr
-    soup = sanitized_soup(htmlstr)
+    soup = sanitized_soup(htmlstr, **kwargs)
     tc = TextCollector(max_length)
     tc.add_chunk(soup)
     return tc.text.strip()

{lino-25.8.2.dist-info → lino-25.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.8.2
+Version: 25.9.0
 Summary: A framework for writing desktop-like web applications using Django and ExtJS or React
 Project-URL: Homepage, https://www.lino-framework.org
 Project-URL: Repository, https://gitlab.com/lino-framework/lino