fix: Refine the nav titles and the footer project link

Suggested-by: Ihor Radchenko <yantar92@posteo.net>

Author: bzg

README.org

@@ -192,7 +192,7 @@ exactly one of the three type keys:
 | =:archive-format-string= | no       | URL template for message-ids (=%s= is replaced)                         |
 | =:base-url=              | no       | Base URL where this source's public directory is served               |
 | =:website=               | no       | Project website, linked from page titles and footers                  |
-| =:contribute-url=        | no       | Contribution guide; drives the "Create new" button and a footer link  |
+| =:contribute-url=        | no       | Contribution guide; drives the "Create new" button                    |
 | =:post-address=          | no       | Posting address shown on =docs.html= (mailbox sources fall back to =:to=) |
 | =:report-types=          | no       | Restrict detected and exported types, e.g. =#{:bug :patch}=             |
 | =:export-formats=        | no       | Output formats (default: =["json" "org" "rss"]=)                        |

config.edn.example

@@ -58,9 +58,9 @@
             ;; Project links surfaced on the exported pages (all
             ;; optional): :website links the source name in the page
             ;; titles and the footer; :contribute-url drives the
-            ;; "Create new" button on the reports page and a footer
-            ;; link; :post-address is the address shown on docs.html
-            ;; for creating reports (mailbox sources fall back to :to).
+            ;; "Create new" button on the reports page; :post-address
+            ;; is the address shown on docs.html for creating reports
+            ;; (mailbox sources fall back to :to).
             ;;
             ;; :website        "https://project.example.org"
             ;; :contribute-url "https://project.example.org/contribute.html"

docs/bone-manual.org

@@ -1050,7 +1050,7 @@ Emails that match no source are discarded at ingestion.
 |                        | =Archived-At= header is absent                                                                |
 | =:base-url=              | Base URL where this source's public directory is served                                     |
 | =:website=               | Project website: links the source name in page titles and the footer                        |
-| =:contribute-url=        | Contribution guide: "Create new" button on the reports page, plus a footer link             |
+| =:contribute-url=        | Contribution guide: drives the "Create new" button on the reports page                      |
 | =:post-address=          | Posting address shown on =docs.html= (mailbox sources fall back to =:to=)                       |
 | =:labels=                | Per-source label overrides (see [[#customising-subject-labels][customising subject labels]])                                 |
 | =:commands=              | Per-source command overrides (see [[#customising-commands][customising commands]])                                     |

scripts/bone-docs.clj

@@ -307,7 +307,7 @@
   .meta { font-size: 0.78rem; color: var(--pico-muted-color); margin-bottom: 2rem; }
 " footer-css))
 
-(defn docs-page [body-html {:keys [ical website contribute-url]}]
+(defn docs-page [body-html {:keys [ical website source]}]
   (let [title        "BONE - Docs"
         generated-at (str (java.util.Date.))]
     (str
@@ -337,7 +337,7 @@
          [:script (h/raw (wrap-js theme-toggle-js))]]
         (bone-footer {:ical ical
                       :website website
-                      :contribute-url contribute-url})]]))))
+                      :source source})]]))))
 
 ;; ---------------------------------------------------------------------------
 ;; Filter feed links in "Getting the data" table
@@ -516,7 +516,7 @@
                                                         "announcements.ics"))]
                       (docs-page body-html {:ical has-ical?
                                             :website (:website source-cfg)
-                                            :contribute-url (:contribute-url source-cfg)}))
+                                            :source source-name}))
                     (finally
                       ((resolve 'pod.huahaiy.datalevin/close) conn)))]
   (io/make-parents out-file)

scripts/bone-index.clj

@@ -309,7 +309,7 @@
                         [:div#pagination]])
                       (h/html (bone-footer {:ical has-ical?
                                             :website website
-                                            :contribute-url contribute})))]
+                                            :source source-name})))]
     (str
      "<!DOCTYPE html>\n"
      (h/html

scripts/bone-stats.clj

@@ -582,7 +582,7 @@
   \"Available data\" table, and the scripts.  Carries no report data --
   bone-stats.js fetches stats.json (via meta.json) and fills it in, so the
   file stays byte-stable across data-only changes."
-  [out-dir source-name {:keys [website contribute-url]}]
+  [out-dir source-name {:keys [website]}]
   (let [title        (page-title "Data" source-name)
         has-ical?    (.exists (io/file out-dir "events" "announcements.ics"))
         data-section (render-data-section out-dir)
@@ -605,7 +605,7 @@
                           "</section>\n")
         tpl-footer   (str (h/html (bone-footer {:ical has-ical?
                                                 :website website
-                                                :contribute-url contribute-url})))]
+                                                :source source-name})))]
     (str
      "<!DOCTYPE html>\n"
      "<html lang=\"en\" data-theme=\"light\">\n"
@@ -671,7 +671,7 @@
   (let [src (some #(when (= source-name (:name %)) %)
                   (:sources (load-config)))]
     (spit-html out-file (render-shell out-dir source-name
-                                      (select-keys src [:website :contribute-url]))))
+                                      (select-keys src [:website]))))
   (log/info "Wrote shell" out-file))
 
 (defn -main [& args]

scripts/bone/html_bb.clj

@@ -178,12 +178,14 @@
   ([title current] (nav-bar title current nil))
   ([title current {:keys [source source-href]}]
    [:nav
-    [:ul [:li [:a {:href "index.html" :style "text-decoration:none;color:inherit"}
+    [:ul [:li [:a {:href "index.html" :title "Back to BONE homepage"
+                   :style "text-decoration:none;color:inherit"}
                [:strong title]]
           (when source
             (list " - "
                   (if source-href
                     [:a {:href source-href
+                         :title (str "Visit " source " website")
                          :style "text-decoration:none;color:inherit"}
                      [:strong source]]
                     [:strong source])))]]
@@ -251,13 +253,13 @@
 (defn bone-footer
   "Footer with BONE repo + license link.
   Options:
-    :feeds  when true (default), appends per-source RSS/JSON/Org links.
-            Set to false on the root index where those paths don't exist.
-    :ical   when true (default) and :feeds is on, appends an iCal link.
-    :website / :contribute-url  when set, append links to the tracked
-            project's website and contribution page."
+    :feeds    when true (default), appends per-source RSS/JSON/Org links.
+              Set to false on the root index where those paths don't exist.
+    :ical     when true (default) and :feeds is on, appends an iCal link.
+    :website  when set, appends a link to the tracked project's website,
+              labeled with :source (the source name) when available."
   ([] (bone-footer {}))
-  ([{:keys [ical feeds website contribute-url] :or {ical true feeds true}}]
+  ([{:keys [ical feeds website source] :or {ical true feeds true}}]
    [:footer.bone-footer
     [:a {:href bone-repo-url} "BONE"]
     " is "
@@ -273,9 +275,7 @@
             (when ical
               (list " -- " [:a {:href "events/announcements.ics"} "iCal"]))))
     (when website
-      (list " -- " [:a {:href website} "Website"]))
-    (when contribute-url
-      (list " -- " [:a {:href contribute-url} "Contribute"]))]))
+      (list " -- " [:a {:href website} (or source "Website")]))]))
 
 ;; ---------------------------------------------------------------------------
 ;; Org-mode inline link conversion (shared by bone-docs, bone-stats)