merge infobox pr

internetarchive · May 2, 2024 · 17538fd · 17538fd
1 parent 4b1ab24
commit 17538fd
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 14 deletions.
diff --git a/openlibrary/templates/authors/infobox.html b/openlibrary/templates/authors/infobox.html
@@ -0,0 +1,22 @@
+$def with (page)
+
+$def render_infobox_row(label, itemprop, value):
+    $if value:
+        <tr>
+            <td><strong>$_(label)</strong></td>
+            <td><span itemprop="$itemprop">$value</span></td>
+        </tr>
+
+<div class="infobox">
+    <div class="illustration">
+        $:render_template("covers/author_photo", page)
+        $:render_template("covers/change", page, ".bookCover img")
+    </div>
+    <table>
+        $if page.birth_date or page.death_date:
+            $:render_infobox_row("Born", 'birthDate', page.birth_date)
+            $:render_infobox_row("Died", 'deathDate', page.death_date)
+        $elif page.date:
+                $:render_infobox_row("Date", '', page.date)
+    </table>
+</div>
diff --git a/openlibrary/templates/type/author/view.html b/openlibrary/templates/type/author/view.html
@@ -40,18 +40,20 @@
 
 $set_share_links(url=request.canonical_url, title=title, view_context=ctx)
 
+$ show_librarian_extras = ctx.user and (ctx.user.is_admin() or ctx.user.is_usergroup_member('/usergroup/librarians'))
 <div id="contentHead">
 
     $:macros.databarView(page)
 
     <h1 itemprop="name">$title</h1>
-    <h2 class="author collapse">
-    $if page.birth_date or page.death_date:
-        <span itemprop="birthDate">$page.birth_date</span> - <span itemprop="deathDate">$page.death_date</span>
-    $else:
-        $if page.date:
-            $page.date
-    </h2>
+    $if show_librarian_extras:
+        <h2 class="author collapse">
+            $if page.birth_date or page.death_date:
+                <span itemprop="birthDate">$page.birth_date</span> - <span itemprop="deathDate">$page.death_date</span>
+            $else:
+                $if page.date:
+                    $page.date
+        </h2>
 
 </div>
 
@@ -107,7 +109,9 @@ <h2 class="author collapse">
                 <h6 class="collapse black uppercase">$_("Location")</h6>
                 $page.location
             </div>
-
+        <span class="mobile-only">
+            $:render_template("authors/infobox", page)
+        </span>
         <div class="clearfix"></div>
         <div id="works" class="section">
                 <h2 class="collapse">
@@ -139,7 +143,6 @@ <h2 class="collapse">
 
                 <div id="searchResults">
                     <ul class="list-books">
-                      $ show_librarian_extras = ctx.user and (ctx.user.is_admin() or ctx.user.is_usergroup_member('/usergroup/librarians'))
                       $for doc in books.docs:
                          $:macros.SearchResultsWork(doc, show_librarian_extras=show_librarian_extras, include_dropper=True)
                     </ul>
@@ -149,11 +152,9 @@ <h2 class="collapse">
         </div>
     </div>
     <div class="contentOnethird">
-        <div class="illustration">
-            $:render_template("covers/author_photo", page)
-            $:render_template("covers/change", page, ".bookCover img")
-        </div>
-
+        <span class="desktop-only">
+            $:render_template("authors/infobox", page)
+        </span>
         $def render_subjects(label, subjects, prefix):
             $if subjects:
                 <div class="section link-box link-box--with-header">

diff --git a/static/css/components/author-infobox.less b/static/css/components/author-infobox.less
@@ -0,0 +1,32 @@
+// used in infobox.html
+.infobox {
+  line-height: 1.5em;
+  background-color: @grey-fafafa;
+  border-radius: 5px;
+  padding: 10px;
+  margin-bottom: 3px;
+  border-bottom: 1px solid @light-beige;
+
+  .illustration {
+    margin-bottom: unset;
+  }
+
+  tr {
+    // Without this page-user.css makes the background beige
+    background-color: transparent;
+    td:first-child {
+      padding-right: 5px;
+    }
+  }
+
+  table {
+    // Without this page-user.css makes the table very compact
+    border-collapse: unset;
+    border-spacing: 3px;
+  }
+}
+
+.infobox-name {
+  text-align: center;
+  margin-bottom: 10px;
+}
diff --git a/static/css/page-user.less b/static/css/page-user.less
@@ -224,6 +224,8 @@ tr.table-row.selected{
   transform: translateY(-50%);
 }
 
+// Import styles for author infobox
+@import (less) "components/author-infobox.less";
 // Import all common components
 @import (less) "legacy.less";
 // Import styles specific to the BorrowTable for user pages