Merge pull request #6741 from roed314/announce_box

Use content.announcements knowl for announcements box

Author: jenpaulhus

lmfdb/app.py

@@ -366,6 +366,17 @@ def top_rcs():
     bread = [(t, " ")]
     return render_template("single.html", kid="rcs", title=t, bread=bread)
 
+@app.route("/announcements")
+def announcements():
+    t = "Announcements"
+    bread = [(t, " ")]
+    return render_template("single.html", kid="content.announcements", title=t, bread=bread)
+
+@app.route("/ongoing")
+def ongoing():
+    t = "Ongoing projects"
+    bread = [(t, " ")]
+    return render_template("single.html", kid="content.ongoing", title=t, bread=bread)
 
 @app.route("/health")
 @app.route("/alive")

lmfdb/homepage/boxes.py

@@ -5,28 +5,31 @@
 
 
 class Box():
-    def __init__(self, title):
-        self.title = title
-        self.content = None
-        self.links = []
-        self.target = url_for('index')
-        self.img = None
-
-    def add_link(self, title, href):
-        self.links.append((title, href))
+    def __init__(self, data):
+        self.title = data["title"]
+        self.img = url_for('static', filename=f'images/{data["image"]}.png')
+        if self.title == "Announcements":
+            # Dynamic content generated from knowl
+            from lmfdb.knowledge.knowl import knowldb
+            from lmfdb.knowledge.main import md
+            max_entries = 3
+            content = [line.strip() for line in
+                       knowldb.get_knowl("content.announcements", ["content"])["content"].split("\n")]
+            # Only keep lines that are part of an unordered list
+            content = [line for line in content if line.startswith("* ") or line.startswith("- ") or line.startswith("+ ")]
+            overflow = len(content) > max_entries
+            content = content[:max_entries]
+            content = "\n".join(content)
+            if overflow:
+                content += "\n* [More...](/announcements)    (and [ongoing projects](/ongoing))"
+            else:
+                content += "\n* See also [ongoing projects](/ongoing)"
+            self.content = md.convert(content)
+        else:
+            self.content = data["content"]
 
 @cached_function
 def load_boxes():
-    boxes = []
     _curdir = os.path.dirname(os.path.abspath(__file__))
     with open(os.path.join(_curdir, "index_boxes.yaml")) as boxfile:
-        listboxes = yaml.load_all(boxfile, Loader=yaml.FullLoader)
-        for b in listboxes:
-            B = Box(b['title'])
-            B.content = b['content']
-            if 'image' in b:
-                B.img = url_for('static', filename='images/'+b['image']+'.png')
-            for title, url in b['links']:
-                B.add_link(title, url)
-            boxes.append(B)
-    return boxes
+        return [Box(b) for b in yaml.load_all(boxfile, Loader=yaml.FullLoader)]

lmfdb/homepage/index_boxes.yaml

@@ -3,36 +3,21 @@ title: A database
 image: families
 content: <p>The LMFDB is a database of mathematical objects arising in number theory and arithmetic geometry that illustrates some of the mathematical connections predicted by the Langlands program.</p>
   <p>Click a heading on the left to browse, or <a href="/random">go to a random page</a>.</p>
-control: 1
-links:
-  - [ 0,0 ]
 ---
 title: Announcements
-content: <p>Check out the recently updated <a href="/Groups/Abstract/">abstract groups</a> database.</p>
-  <p>Check out the new <a href="/ModularCurve/Q/">modular curves</a> database [beta].</p>
 image: announcements
-control: 0
-links:
-  - [ 0,0 ]
 ---
 title: Learn more
 image: smalluniverse
 content: <p>Information is available regarding the <a href="/rcs">source, reliability, and completeness</a> of the database.</p>
   <p><a href="/knowledge/show/doc.knowl">Knowls</a> provide explanations when you need them.</p><p><a href="/intro">Overview</a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="/universe">LMFDB universe</a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="/knowledge/">Knowledge</a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="/api/">Data</a></p>
-control: 0
-links:
-  - [ 0,0 ]
 ---
 title: Citations and acknowledgments
 image: citations
 content: <ul>
     <li><a href="/citation">How to cite the LMFDB</a></li>
-    <li><a href="https://github.com/LMFDB/lmfdb">Source code repository</li>
-    <li><a href="/management">Editorial board</li>
-    <li><a href="/acknowledgment">Acknowledgments</li>
-    <li><a href="/acknowledgment/activities">Activities</li>
+    <li><a href="https://github.com/LMFDB/lmfdb">Source code repository</a></li>
+    <li><a href="/management">Editorial board</a></li>
+    <li><a href="/acknowledgment">Acknowledgments</a> and <a href="/acknowledgment/activities">activities</a></li>
   </ul>
-control: 0
-links:
-  - [ 0,0 ]
 ...

lmfdb/knowledge/main.py

@@ -755,7 +755,7 @@ def render_knowl(ID, footer=None, kwargs=None,
     # the idea is to pass the keyword arguments of the knowl further along the chain
     # of links, in this case the title and the permalink!
     # so, this kw_params should be plain python, e.g. "a=1, b='xyz'"
-    kw_params = ', '.join(('%s="%s"' % (k, v) for k, v in kwargs.items()))
+    kw_params = ', '.join(('%s="%s"' % (key, val) for key, val in kwargs.items()))
     logger.debug("kw_params: %s" % kw_params)
 
     # this is a very simple template based on no other template to render one single Knowl