summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsirgazil <felipe.lopez@openmailbox.org>2016-11-26 22:09:45 -0500
committersirgazil <felipe.lopez@openmailbox.org>2016-11-26 22:09:45 -0500
commitbb4a07180422e390233c0ad696e3b6a952acdc33 (patch)
treeee27a513cb0f81ec6a67130c34d5f3aaaa9d9008
parent4a2d3b587a527e5f3f508744b0483b0763bcd7ef (diff)
downloadguix-artwork-bb4a07180422e390233c0ad696e3b6a952acdc33.tar
guix-artwork-bb4a07180422e390233c0ad696e3b6a952acdc33.tar.gz
website: packages: Fix invalid HTML (bug #22115).
* README (Building and running special pages): Correct environment variable. * www/packages.scm (packages-page): Move update date to the top of the page. (package->sxml): Use ID instead of NAME attribute for anchors, and move out DIV element from P element, which is invalid.
-rw-r--r--website/README2
-rw-r--r--website/www/packages.scm16
2 files changed, 8 insertions, 10 deletions
diff --git a/website/README b/website/README
index d5f6459..99d13ee 100644
--- a/website/README
+++ b/website/README
@@ -52,7 +52,7 @@ built using *Haunt*. To build them, and try them out locally, do the
following:
1. Add the directory containing the source code of GNU Guix to the
- ~PATH~ environment variable.
+ ~GUILE_LOAD_PATH~ environment variable.
2. Build the part of the website that builds with *Haunt*:
#+BEGIN_EXAMPLE
diff --git a/website/www/packages.scm b/website/www/packages.scm
index 747320f..9f345ae 100644
--- a/website/www/packages.scm
+++ b/website/www/packages.scm
@@ -215,13 +215,13 @@ description-ids as formal parameters."
(title "Part of GNU")))
""))
"\n"
- (td (a (@ (href ,(source-url package))
+ (td (a (@ (id ,anchor)
+ (href ,(source-url package))
(title "Link to the Guix package source code"))
,(package-name package) " "
,(package-version package)))
"\n"
- (td (span ,(package-synopsis package)
- (a (@ (name ,anchor))))
+ (td (span ,(package-synopsis package))
(div (@ (id ,description-id))
,(match (package-logo (package-name package))
((? string? url)
@@ -231,7 +231,7 @@ description-ids as formal parameters."
(alt ("Logo of " ,(package-name package))))))
(_ #f))
"\n"
- (p ,(package-description-shtml package))
+ ,(package-description-shtml package)
"\n"
,(license package)
(a (@ (href ,(package-home-page package))
@@ -470,11 +470,9 @@ PACKAGES."
". This is a complete list of the packages. Our "
(a (@ (href "http://hydra.gnu.org/jobset/gnu/master"))
"continuous integration system")
- " shows their current build status.")
- ,(packages->sxml (all-packages))
-
- (p "Updated " ,(date->string (current-date) "~B ~e, ~Y")
- ".")))
+ " shows their current build status "
+ "(Updated " ,(date->string (current-date) "~B ~e, ~Y") ").")
+ ,(packages->sxml (all-packages))))
,(html-page-footer))))