Data Package inline format

dribdat · Nov 13, 2022 · bd376b7 · bd376b7
1 parent b66171d
commit bd376b7
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 21 deletions.
diff --git a/dribdat/apipackage.py b/dribdat/apipackage.py
@@ -37,7 +37,7 @@ def PackageEvent(event, author=None, host_url='', full_contents=False):
     package = Package(
         name='event-%d' % event.id,
         title=event.name,
-        description="Event and project details collected with dribdat",
+        description=event.summary or event.description,
         keywords=["dribdat", "hackathon", "co-creation"],
         sources=[{"title": "dribdat", "path": "https://dribdat.cc"}],
         licenses=[{

diff --git a/dribdat/boxout/datapackage.py b/dribdat/boxout/datapackage.py
@@ -3,40 +3,47 @@
 import re
 import logging
 import pystache
+from datetime import datetime
 from frictionless import Package
 
 TEMPLATE_PACKAGE = r"""
 <div class="boxout datapackage card mb-4" style="max-width:23em">
   <div class="card-body">
-    <a href="{{homepage}}">
-        <h5 class="card-title font-weight-bold">{{title}}</h5>
-    </a>
-    <a href="{{url}}" download>
-        <h6 class="card-subtitle mb-2 text-muted">Data Package</h6>
-    </a>
-    <div class="card-text description">{{description}}</div>
+    <h5 class="card-title font-weight-bold">
+        {{dp.title}}
+    </h5>
+    <h6 class="card-subtitle mb-2 text-muted">
+        Data Package
+        <a href="{{dp.homepage}}" title="Home page">
+            &#127760;&nbsp;www
+        </a>
+        <a href="{{url}}" download title="Get Data Package">
+            &#127760;&nbsp;json
+        </a>
+    </h6>
+    <div class="card-text description">{{dp.description}}</div>
     <ul class="resources list-unstyled">
-    {{#resources}}
+    {{#dp.resources}}
         <li><a href="{{path}}" download class="card-link">{{name}}</a>
         <span class="schema-fields">{{#schema.fields}}
             <b title="{{type}}">&#9632;</b>
         {{/schema.fields}}</span></li>
-    {{/resources}}
+    {{/dp.resources}}
     </ul>
     <div class="details font-size-small">
-        <div class="sources float-left">&#128230;
-        {{#sources}}
-            <a href="{{path}}">{{name}}</a>
-        {{/sources}}
+        <div class="sources float-left">
+        {{#dp.sources}}
+            <a href="{{path}}">&#128230; {{title}}</a>
+        {{/dp.sources}}
         </div>
-        {{#licenses}}
-        <i class="created">{{created}}</i>
+        <small title="Date" class="created">{{date}}</small>
             &nbsp;
-        <i class="version">{{version}}</i>
+        <i title="Version" class="version">{{dp.version}}</i>
             &nbsp;
-        <a class="license" target="_top"
-           href="{{path}}" title="{{title}}">License</a>
-        {{/licenses}}
+        {{#dp.licenses}}
+            <a class="license" target="_top"
+               href="{{path}}" title="{{title}}">License</a>
+        {{/dp.licenses}}
     </div>
   </div>
 </div>
@@ -66,7 +73,9 @@ def box_datapackage(line, cache=None):
     except Exception:  # noqa: B902
         logging.warn("Data Package not parsed: <%s>" % url)
         return None
-    box = pystache.render(TEMPLATE_PACKAGE, package)
+    dt = datetime.fromisoformat(package.created).strftime("%d.%m.%Y")
+    box = pystache.render(
+        TEMPLATE_PACKAGE, {'url': url, 'dp': package, 'date': dt})
     if cache:
         cache.set(url, box)
     if cache and cache.has(url):

diff --git a/dribdat/static/css/style.css b/dribdat/static/css/style.css
@@ -865,6 +865,9 @@ nav .nav-login {
   border-radius: 0px;
   clear: both;
 }
+.project-page .project-longtext .card {
+  background: none;
+}
 .project-page .project-star i {
   padding-right: 5px;
 }