From: Luis Felipe via Guix-patches via <guix-patches@gnu.org>
To: 59385@debbugs.gnu.org
Subject: [bug#59385] [PATCH] website: Link to the new packages browser
Date: Sat, 19 Nov 2022 13:47:40 +0000 [thread overview]
Message-ID: <zXAO_O-FJjvCko_ocjv5hT50oWHjDwH43RxS1X8AIPRO9Cx_3AsiBRCD29YO_4efJAJKJwGEba3uVos74d69mCx_6oJ6yVlekvKzNyaWDHk=@protonmail.com> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 124 bytes --]
Hi,
This is a patch for the guix-artwork repository.
---
Luis Felipe López Acevedo
https://luis-felipe.gitlab.io/
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-website-Link-to-the-new-packages-browser.patch --]
[-- Type: text/x-patch; filename="0001-website-Link-to-the-new-packages-browser.patch"; name="0001-website-Link-to-the-new-packages-browser.patch", Size: 6117 bytes --]
From ad0effaab60acdb7bd0e533bd544b49a4bee8a2b Mon Sep 17 00:00:00 2001
From: Luis Felipe <luis.felipe.la@protonmail.com>
Date: Sat, 19 Nov 2022 08:21:04 -0500
Subject: [PATCH] website: Link to the new packages browser.
Update all package-related links to point to the newly deployed browser
at https://packages.guix.gnu.org/.
* website/apps/base/utils.scm (packages-url): New procedure.
* website/apps/base/data.scm (contact-media): Use packages-url.
* website/apps/base/templates/components.scm (navbar): Likewise.
* website/apps/base/templates/contribute.scm (contribute-t): Likewise.
* website/apps/base/templates/donate.scm (donate-t): Likewise.
* website/apps/base/templates/home.scm (home-t): Likewise.
---
website/apps/base/data.scm | 2 +-
website/apps/base/templates/components.scm | 5 ++++-
website/apps/base/templates/contribute.scm | 6 +++---
website/apps/base/templates/donate.scm | 2 +-
website/apps/base/templates/home.scm | 2 +-
website/apps/base/utils.scm | 14 +++++++++++++-
6 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/website/apps/base/data.scm b/website/apps/base/data.scm
index 4f1bb5f..ad44a10 100644
--- a/website/apps/base/data.scm
+++ b/website/apps/base/data.scm
@@ -190,7 +190,7 @@ het Nederlands.")
"This is a private mailing list that anyone can post to to "
,(G_ `(a (@ (href ,(guix-url "security/"))) "report security issues"))
" in Guix itself or in "
- "the " ,(G_ `(a (@ (href ,(guix-url "packages/"))) "packages"))
+ "the " ,(G_ `(a (@ (href ,(packages-url))) "packages"))
" it provides. Posting here allows Guix developers to address
the problem before it is widely publicized."))
#:url "https://lists.gnu.org/mailman/listinfo/guix-security"
diff --git a/website/apps/base/templates/components.scm b/website/apps/base/templates/components.scm
index e1e0b23..5f4af9c 100644
--- a/website/apps/base/templates/components.scm
+++ b/website/apps/base/templates/components.scm
@@ -463,7 +463,10 @@ manual.
#:url (guix-url "contact/")))))
- ,(C_ "website menu" (menu-item #:label "Packages" #:active-item active-item #:url (guix-url "packages/")))
+ ,(C_ "website menu"
+ (menu-item #:label "Packages"
+ #:active-item active-item
+ #:url (packages-url)))
,(C_ "website menu" (menu-item #:label "Blog" #:active-item active-item #:url (guix-url "blog/")))
,(menu-dropdown #:label (C_ "website menu" "Media") #:active-item active-item
diff --git a/website/apps/base/templates/contribute.scm b/website/apps/base/templates/contribute.scm
index 9b7987c..42ffcb9 100644
--- a/website/apps/base/templates/contribute.scm
+++ b/website/apps/base/templates/contribute.scm
@@ -125,7 +125,7 @@ Translation|I18N|L10N|Artwork") #\|)
,(G_
`(p
"Helping improve the documentation of the "
- ,(G_ `(a (@ (href ,(guix-url "packages/"))) "packaged software"))
+ ,(G_ `(a (@ (href ,(packages-url))) "packaged software"))
" is another way to contribute. "))
(p
,(link-more
@@ -157,7 +157,7 @@ Translation|I18N|L10N|Artwork") #\|)
,(G_
`(p
"Check out the "
- ,(G_ `(a (@ (href ,(guix-url "packages/")))
+ ,(G_ `(a (@ (href ,(packages-url)))
"package database"))
" for a list of available packages, and the "
,(G_ `(a (@ (href "//issues.guix.gnu.org/search?query=tag%3Apatch+is%3Aopen"))
@@ -290,7 +290,7 @@ Translation|I18N|L10N|Artwork") #\|)
" to have a look at the styleguides and the work of other translators"))
,(G_
`(p
- ,(G_ `(a (@ (href ,(guix-url "packages"))) "Software packages"))
+ ,(G_ `(a (@ (href ,(packages-url))) "Software packages"))
" provided by the system may have their own translation
tools. Visit their websites and help translate. "))
(p
diff --git a/website/apps/base/templates/donate.scm b/website/apps/base/templates/donate.scm
index 595e1d3..5257a57 100644
--- a/website/apps/base/templates/donate.scm
+++ b/website/apps/base/templates/donate.scm
@@ -41,7 +41,7 @@ system|GNU Hurd|GNU Guix package manager|Donations") #\|)
"build farm"))
" of Guix runs on donated hardware and"
" hosting. As the distribution grows (see the "
- ,(G_ `(a (@ (href ,(guix-url "packages/"))) "package list"))
+ ,(G_ `(a (@ (href ,(packages-url))) "package list"))
"), so do the computing and storage needs."))
,(G_
diff --git a/website/apps/base/templates/home.scm b/website/apps/base/templates/home.scm
index 47adeb7..7b72da8 100644
--- a/website/apps/base/templates/home.scm
+++ b/website/apps/base/templates/home.scm
@@ -136,7 +136,7 @@ goods readily available for installing with the "
,(button-big
#:label (C_ "button" "ALL PACKAGES")
- #:url (guix-url "packages/")
+ #:url (packages-url)
#:light #true))
,(horizontal-separator #:light #true)
diff --git a/website/apps/base/utils.scm b/website/apps/base/utils.scm
index d172433..c69d034 100644
--- a/website/apps/base/utils.scm
+++ b/website/apps/base/utils.scm
@@ -41,7 +41,8 @@
manual-devel-url
manual-url-with-language
number*
- paginate))
+ paginate
+ packages-url))
;;;
@@ -172,6 +173,17 @@ manual.
;; The _ argument is a placeholder for an arg added by G_, cf. i18n-howto.txt.
(manual-url subpath #:language language))
+(define* (packages-url #:optional (path ""))
+ "Append PATH to https://packages.guix.gnu.org/ URL.
+
+ PATH (string)
+ An optional relative URL path to a resource. For example:
+ 'packages/guile/'.
+
+ RETURN VALUE (string)
+ A URL. For example: https://packages.guix.gnu.org/packages/guile/."
+ (string-append "https://packages.guix.gnu.org/" path))
+
;;;
base-commit: eaa7e78164003f198d598e20fff871c428d95ded
--
2.38.0
[-- Attachment #1.3: publickey - luis.felipe.la@protonmail.com - 0x12DE1598.asc --]
[-- Type: application/pgp-keys, Size: 1722 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 509 bytes --]
next reply other threads:[~2022-11-19 13:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-19 13:47 Luis Felipe via Guix-patches via [this message]
2022-11-21 11:05 ` [bug#59385] [PATCH] website: Link to the new packages browser Ludovic Courtès
2022-11-21 16:38 ` Luis Felipe via Guix-patches via
2022-11-25 17:09 ` bug#59385: " Ludovic Courtès
2022-11-25 19:01 ` [bug#59385] " Christopher Baines
2022-11-26 16:22 ` Ludovic Courtès
2022-11-25 21:49 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='zXAO_O-FJjvCko_ocjv5hT50oWHjDwH43RxS1X8AIPRO9Cx_3AsiBRCD29YO_4efJAJKJwGEba3uVos74d69mCx_6oJ6yVlekvKzNyaWDHk=@protonmail.com' \
--to=guix-patches@gnu.org \
--cc=59385@debbugs.gnu.org \
--cc=luis.felipe.la@protonmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.