From f3d02bf0e7050f544e044b8dd53d52e9dba28d54 Mon Sep 17 00:00:00 2001
From: Canan Talayhan <canan.t.talayhan@gmail.com>
Date: Sun, 18 Apr 2021 14:50:20 +0300
Subject: [PATCH] Set a more informative page title for any page where the
 title is "Guix Data Service"

---
 guix-data-service/web/build-server/html.scm | 24 +++++-
 guix-data-service/web/build/html.scm        |  6 +-
 guix-data-service/web/compare/html.scm      | 32 ++++++--
 guix-data-service/web/dumps/html.scm        |  7 +-
 guix-data-service/web/jobs/html.scm         | 25 +++++-
 guix-data-service/web/nar/html.scm          |  6 +-
 guix-data-service/web/package/html.scm      |  6 +-
 guix-data-service/web/repository/html.scm   | 30 ++++++-
 guix-data-service/web/revision/html.scm     | 89 +++++++++++++++++++--
 guix-data-service/web/view/html.scm         | 12 ++-
 10 files changed, 209 insertions(+), 28 deletions(-)

diff --git a/guix-data-service/web/build-server/html.scm b/guix-data-service/web/build-server/html.scm
index f16a570..541a960 100644
--- a/guix-data-service/web/build-server/html.scm
+++ b/guix-data-service/web/build-server/html.scm
@@ -27,7 +27,11 @@
 (define (view-build query-parameters
                     build
                     required-failed-builds)
+  (define page-header "Build")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -36,7 +40,7 @@
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h1 "Build")))
+        (h1 ,page-header)))
       (div
        (@ (class "row"))
        ,@(match build
@@ -98,7 +102,11 @@
             '())))))
 
 (define (view-build-servers build-servers)
+  (define page-header "Build servers")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -107,7 +115,7 @@
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h2 "Build servers")
+        (h2 ,page-header)
         ,@(map
            (match-lambda
              ((id url lookup-all-derivations? lookup-builds?)
@@ -127,7 +135,11 @@
            build-servers)))))))
 
 (define (view-build-server build-server)
+  (define page-header "Build server")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -136,7 +148,7 @@
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h2 "Build server")
+        (h2 ,page-header)
         ,(match build-server
            ((url lookup-all-derivations?)
             `(dl
@@ -150,7 +162,11 @@
                        "No")))))))))))
 
 (define (view-signing-key sexp)
+  (define page-header "Signing key")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -159,5 +175,5 @@
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h2 "Signing key")
+        (h2 ,page-header)
         ,(sexp-div sexp)))))))
diff --git a/guix-data-service/web/build/html.scm b/guix-data-service/web/build/html.scm
index 18d045a..4b758bb 100644
--- a/guix-data-service/web/build/html.scm
+++ b/guix-data-service/web/build/html.scm
@@ -29,7 +29,11 @@
                      valid-targets
                      stats
                      builds)
+  (define page-header "Builds")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -38,7 +42,7 @@
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h1 "Builds")
+        (h1 ,page-header)
         (table
          (@ (class "table"))
          (thead
diff --git a/guix-data-service/web/compare/html.scm b/guix-data-service/web/compare/html.scm
index 5b5fe0a..170fb12 100644
--- a/guix-data-service/web/compare/html.scm
+++ b/guix-data-service/web/compare/html.scm
@@ -96,7 +96,12 @@
     (unless invalid-query?
       (query-parameters->string query-parameters)))
 
+  (define page-header "Comparing")
+
   (layout
+   #:title
+   (string-append page-header " " (string-take base-commit 8) " and "
+    (string-take target-commit 8))
    #:body
    `(,(header)
      (div
@@ -107,7 +112,7 @@
         (@ (class "col-sm-7"))
         ,@(if invalid-query?
               `((h1 "Compare"))
-              `((h1 "Comparing "
+              `((h1 ,page-header ," "
                     (a (@ (href ,(string-append "/revision/" base-commit)))
                        (samp ,(string-take base-commit 8) "…"))
                     " and "
@@ -419,14 +424,18 @@
     '(span (@ (class "text-success glyphicon glyphicon-plus pull-left")
               (style "font-size: 1.5em; padding-right: 0.4em;"))))
 
+  (define page-header "Comparing derivations")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
       (@ (class "container"))
       (div
        (@ (class "row"))
-       (h1 ,@(let ((base-commit (assq-ref query-parameters 'base_commit))
+       (h1 ,(let ((base-commit (assq-ref query-parameters 'base_commit))
                    (target-commit (assq-ref query-parameters 'target_commit)))
                (if (every string? (list base-commit target-commit))
                    `("Comparing "
@@ -435,7 +444,7 @@
                      " and "
                      (a (@ (href ,(string-append "/revision/" target-commit)))
                         (samp ,(string-take target-commit 8) "…")))
-                   '("Comparing derivations")))))
+                    `,page-header))))
       (div
        (@ (class "row"))
        (div
@@ -685,7 +694,11 @@
   (define fields
     (assq-ref query-parameters 'field))
 
+  (define page-header "Package derivation changes")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -835,7 +848,7 @@ enough builds to determine a change")))
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h1 "Package derivation changes")
+        (h1 ,page-header)
         ,(if
           (null? derivation-changes)
           '(p "No derivation changes")
@@ -950,7 +963,12 @@ enough builds to determine a change")))
     (string-append "?base_commit=" base-commit
                    "&target_commit=" target-commit))
 
+  (define page-header (string-append "Comparing "
+    (string-take base-commit 8) " and " (string-take target-commit 8)))
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -1042,7 +1060,11 @@ enough builds to determine a change")))
                                           #:optional
                                           base-revision-details
                                           target-revision-details)
+  (define page-header "System test derivation changes")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -1141,7 +1163,7 @@ enough builds to determine a change")))
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h1 "System test derivation changes")
+        (h1 ,page-header)
         ,(if
           (null? changes)
           '(p "No system test derivation changes")
diff --git a/guix-data-service/web/dumps/html.scm b/guix-data-service/web/dumps/html.scm
index 71e69c8..9645f7c 100644
--- a/guix-data-service/web/dumps/html.scm
+++ b/guix-data-service/web/dumps/html.scm
@@ -21,8 +21,13 @@
   #:use-module (guix-data-service web view html)
   #:export (view-dumps))
 
+(define page-header "Database dumps")
+
 (define (view-dumps available-dumps)
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -31,7 +36,7 @@
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h1 "Database dumps")))
+        (h1 ,page-header)))
       ,@(map
          (match-lambda
            ((date-string . files)
diff --git a/guix-data-service/web/jobs/html.scm b/guix-data-service/web/jobs/html.scm
index 82734d6..7165e8d 100644
--- a/guix-data-service/web/jobs/html.scm
+++ b/guix-data-service/web/jobs/html.scm
@@ -30,7 +30,11 @@
                    jobs-and-events
                    recent-events
                    show-next-page?)
+  (define page-header "Jobs")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -40,7 +44,7 @@
        (div
         (@ (class "col-sm-12"))
         (h1 (@ (style "display: inline-block;"))
-            "Jobs")
+            ,page-header)
         (div
          (@ (class "btn-group pull-right")
             (style "margin-top: 1.3rem;")
@@ -189,7 +193,11 @@
 
 (define (view-job-events query-parameters
                          recent-events)
+  (define page-header "Recent events")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -200,7 +208,7 @@
         (@ (class "col-sm-12"))
         (a (@ (href "/jobs"))
            (h3 "Jobs"))
-        (h1 "Recent events")))
+        (h1 ,page-header)))
       (div
        (@ (class "row"))
        (div
@@ -256,7 +264,11 @@
              recent-events)))))))))
 
 (define (view-job-queue jobs-and-events)
+  (define page-header "Queued Jobs")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -267,7 +279,7 @@
         (@ (class "col-sm-12"))
         (a (@ (href "/jobs"))
            (h3 "Jobs"))
-        (h1 "Queued jobs ("
+        (h1 ,page-header"("
             ,(length jobs-and-events)
             ")")))
       (div
@@ -329,8 +341,13 @@
                              '())))))
                  jobs-and-events)))))))))
 
+
 (define (view-job job-id query-parameters log)
+  (define page-header (string-append "Job " job-id))
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -339,7 +356,7 @@
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h1 "Job " ,job-id)))
+        (h1 ,page-header)))
       (div
        (@ (class "row"))
        (div
diff --git a/guix-data-service/web/nar/html.scm b/guix-data-service/web/nar/html.scm
index 596d16b..07e6c47 100644
--- a/guix-data-service/web/nar/html.scm
+++ b/guix-data-service/web/nar/html.scm
@@ -21,8 +21,12 @@
   #:use-module (guix-data-service web view html)
   #:export (view-substitutes))
 
+(define page-header "Substitutes")
+
 (define (view-substitutes narinfo-signing-public-key)
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -31,7 +35,7 @@
        (@ (class "row"))
        (div
         (@ (class "col-sm-12"))
-        (h1 "Substitutes")
+        (h1 ,page-header)
         ,@(if (canonical-sexp? narinfo-signing-public-key)
               `((h3 "Public key")
                 (pre
diff --git a/guix-data-service/web/package/html.scm b/guix-data-service/web/package/html.scm
index 0d9b078..af4552e 100644
--- a/guix-data-service/web/package/html.scm
+++ b/guix-data-service/web/package/html.scm
@@ -24,7 +24,11 @@
   #:export (view-package))
 
 (define* (view-package name package-version-with-branches)
+  (define page-header "Package")
+
   (layout
+   #:title
+   (string-append page-header " " name)
    #:body
    `(,(header)
      (div
@@ -33,7 +37,7 @@
        (@ (class "row"))
        (div
         (@ (class "col-md-12"))
-        (h1 "Package: " ,name)))
+        (h1 ,page-header ," " ,name)))
       ,@(map
          (match-lambda
            ((('version . version)
diff --git a/guix-data-service/web/repository/html.scm b/guix-data-service/web/repository/html.scm
index 88f2632..5b8e220 100644
--- a/guix-data-service/web/repository/html.scm
+++ b/guix-data-service/web/repository/html.scm
@@ -32,7 +32,11 @@
             view-no-latest-revision))
 
 (define* (view-git-repositories git-repositories)
+   (define page-header "Git repositories")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -41,7 +45,7 @@
        (@ (class "row"))
        (div
         (@ (class "col-md-12"))
-        (h1 "Git repositories")))
+        (h1 ,page-header)))
       ,@(map
          (match-lambda
            ((id label url cgit-base-url)
@@ -65,7 +69,11 @@
 (define* (view-git-repository git-repository-id
                               label url cgit-url-base
                               branches-with-most-recent-commits)
+  (define page-header (string-append "Repository " (string-drop url 8)))
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -86,7 +94,11 @@
 
 (define (view-branch git-repository-id
                      branch-name query-parameters branch-commits)
+  (define page-header (string-append branch-name " branch"))
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -197,7 +209,11 @@
                              branch-name
                              package-name
                              versions-by-revision-range)
+  (define page-header (string-append branch-name " " package-name))
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -386,6 +402,8 @@
                 (map first derivations-by-revision-range))))
 
   (layout
+   #:title
+   (string-append package-name " Package derivations")
    #:body
    `(,(header)
      (div
@@ -636,6 +654,8 @@
                 (map first outputs-by-revision-range))))
 
   (layout
+   #:title
+   (string-append package-name " Package outputs")
    #:body
    `(,(header)
      (div
@@ -849,6 +869,8 @@
                                          valid-systems
                                          system-test-history)
   (layout
+   #:title
+   (string-append system-test-name " History")
    #:body
    `(,(header)
      (div
@@ -1016,12 +1038,16 @@
                 '(#f))))))))))))
 
 (define (view-no-latest-revision branch-name)
+   (define page-header "No latest revision")
+
   (layout
+   #:title
+   (string-append page-header " for " branch-name)
    #:body
    `(,(header)
      (div
       (@ (class "container"))
-      (h1 "No latest revision")
+      (h1 ,page-header)
       (p "No latest revision for "
          (strong (samp ,branch-name))
          " branch")))))
diff --git a/guix-data-service/web/revision/html.scm b/guix-data-service/web/revision/html.scm
index 25b79f4..ab08eaa 100644
--- a/guix-data-service/web/revision/html.scm
+++ b/guix-data-service/web/revision/html.scm
@@ -48,7 +48,12 @@
 (define* (view-revision-news commit-hash
                              query-parameters
                              news-entries)
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append "Channel News Entries " page-header " "
+    (string-take commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -59,7 +64,7 @@
         (@ (class "col-sm-12"))
         (h3 (a (@ (style "white-space: nowrap;")
                   (href ,(string-append "/revision/" commit-hash)))
-               "Revision " (samp ,commit-hash)))))
+               ,page-header " " (samp ,commit-hash)))))
       (div
        (@ (class "row"))
        (div
@@ -107,7 +112,12 @@
                                 #:key path-base
                                 header-text
                                 header-link)
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append "Package " name " " page-header " "
+    (string-take revision-commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -135,7 +145,7 @@
                                          branch-name))))
                   branches)))
           git-repositories-and-branches)
-        (h1 "Package " ,name)))
+        (h1 ,"Package " ,name)))
       (div
        (@ (class "row"))
        (div
@@ -169,7 +179,12 @@
                                             #:key header-text
                                             header-link
                                             version-history-link)
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append "Package " name " @ " version " " page-header " "
+    (string-take revision-commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -224,7 +239,7 @@
                       (role "button"))
                    "Version history"))
               '())
-        (h1 "Package " ,name " @ " ,version)))
+        (h1 ,"Package " ,name " @ " ,version)))
       (div
        (@ (class "row"))
        (div
@@ -471,7 +486,11 @@
                         lint-warning-counts
                         #:key (path-base "/revision/")
                         header-text)
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append page-header " " (string-take commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -547,7 +566,12 @@
      '("Version" "Synopsis" "Description"
        "Home page" "Location" "Licenses")))
 
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append  "Packages " page-header " "
+    (string-take revision-commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -755,7 +779,12 @@
                    total-package-descriptions)))))
      package-description-counts))
 
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append "Packages translation availability " page-header " "
+    (string-take commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -835,7 +864,11 @@
                                      query-parameters
                                      #:key (path-base "/revision/")
                                      header-text header-link)
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append  "System tests " page-header " " (string-take commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -936,7 +969,12 @@
                                           channel-instances
                                           #:key (path-base "/revision/")
                                           header-text header-link)
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append "Channel instances " page-header " "
+    (string-take commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -1216,7 +1254,12 @@ figure {
                 data-percentages
                 colours))))))
 
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append "Package substitute availability " page-header " "
+    (string-take revision-commit-hash 7))
    #:body
    `(,(header)
      (style ,chart-css)
@@ -1254,7 +1297,12 @@ figure {
                                                 #:key (path-base "/revision/")
                                                 header-text
                                                 header-link)
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append  "Package reproducibility " page-header " "
+    (string-take revision-commit-hash 7))
    #:body
    `(,(header)
      (style "
@@ -1521,7 +1569,12 @@ figure {
   (define fields
     (assq-ref query-parameters 'field))
 
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append  "Package derivations " page-header " "
+    (string-take commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -1702,7 +1755,12 @@ figure {
       ;;("Unknown"   . "unknown") TODO
       ))
 
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append  "Fixed output package derivations " page-header " "
+    (string-take commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -1842,7 +1900,12 @@ figure {
             (cons url id)))
          build-server-urls))
 
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append "Package derivation outputs " page-header " "
+    (string-take commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -2021,7 +2084,11 @@ figure {
                               build-server-options
                               stats
                               builds)
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append  "Builds " page-header " " (string-take commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -2158,7 +2225,12 @@ figure {
               (string-downcase field))))
      '("Linter" "Message" "Location")))
 
+  (define page-header "Revision")
+
   (layout
+   #:title
+   (string-append "Lint warnings " page-header " "
+    (string-take revision-commit-hash 7))
    #:body
    `(,(header)
      (div
@@ -2314,7 +2386,11 @@ figure {
 
 (define (unknown-revision commit-hash job git-repositories-and-branches
                           jobs-and-events)
+  (define page-header "Uknown revision")
+
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -2347,13 +2423,16 @@ figure {
                 (strong (@ (class "text-center")
                            (style "font-size: 2em; display: block;"))
                         "Unknown"))))
-            `((h1 "Unknown revision")
+            `((h1 ,page-header)
               (p "No known revision with commit "
                  (strong (samp ,commit-hash)))))))))
 
 (define (unprocessed-revision commit-hash job git-repositories-and-branches
                               jobs-and-events)
+  (define page-header "Unknown revision")
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
@@ -2375,6 +2454,6 @@ figure {
                        git-repositories-and-branches
                        commit-hash))
                 ,@(view-revision/jobs-and-events jobs-and-events))))
-            `((h1 "Unknown revision")
+            `((h1 ,page-header)
               (p "No known revision with commit "
                  (strong (samp ,commit-hash)))))))))
diff --git a/guix-data-service/web/view/html.scm b/guix-data-service/web/view/html.scm
index 8063e17..33535a9 100644
--- a/guix-data-service/web/view/html.scm
+++ b/guix-data-service/web/view/html.scm
@@ -65,13 +65,15 @@
 (define* (layout #:key
                  (head '())
                  (body '())
-                 (title "Guix Data Service")
+                 title
                  description)
   `((doctype "html")
     (html
      (@ (lang "en"))
      (head
-      (title ,title)
+      (title ,(if title
+               (string-append title " — Guix Data Service")
+               "Guix Data Service"))
       (meta (@ (http-equiv "Content-Type")
                (content "text/html; charset=UTF-8")))
       (meta (@ (name "viewport")
@@ -286,8 +288,7 @@
 (define (index git-repositories-and-revisions)
   (layout
    #:description
-   "The Guix Data Service processes, stores and provides data about Guix over
-time."
+   "The Guix Data Service processes, stores and provides data about Guix over time."
    #:body
    `(,(header)
      (div
@@ -334,7 +335,10 @@ time."
          git-repositories-and-revisions)))))
 
 (define (view-statistics guix-revisions-count derivations-count)
+  (define page-header "Statistics")
   (layout
+   #:title
+   page-header
    #:body
    `(,(header)
      (div
-- 
2.17.1