From patchwork Sat Nov 19 13:47:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Felipe X-Patchwork-Id: 44621 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CE5B827BBE9; Sat, 19 Nov 2022 13:48:27 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A66AA27BBEC for ; Sat, 19 Nov 2022 13:48:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1owOCU-0006ul-9R; Sat, 19 Nov 2022 08:48:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owOCQ-0006su-Qg for guix-patches@gnu.org; Sat, 19 Nov 2022 08:48:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1owOCQ-00052L-GK for guix-patches@gnu.org; Sat, 19 Nov 2022 08:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1owOCQ-00063u-7l for guix-patches@gnu.org; Sat, 19 Nov 2022 08:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59385] [PATCH] website: Link to the new packages browser Resent-From: Luis Felipe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 19 Nov 2022 13:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 59385 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59385@debbugs.gnu.org X-Debbugs-Original-To: Luis Felipe via Guix-patches Received: via spool by submit@debbugs.gnu.org id=B.166886568023284 (code B ref -1); Sat, 19 Nov 2022 13:48:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Nov 2022 13:48:00 +0000 Received: from localhost ([127.0.0.1]:39279 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owOCN-00063R-N5 for submit@debbugs.gnu.org; Sat, 19 Nov 2022 08:48:00 -0500 Received: from lists.gnu.org ([209.51.188.17]:43022) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1owOCJ-00062w-O0 for submit@debbugs.gnu.org; Sat, 19 Nov 2022 08:47:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owOCJ-0006pk-2S for guix-patches@gnu.org; Sat, 19 Nov 2022 08:47:55 -0500 Received: from mail-4325.protonmail.ch ([185.70.43.25]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1owOCB-00050v-KZ for guix-patches@gnu.org; Sat, 19 Nov 2022 08:47:54 -0500 Date: Sat, 19 Nov 2022 13:47:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1668865664; x=1669124864; bh=DjLxH7nQ3T2CisLhX57On/yvHxOUB5yNgzRxovRFMqY=; h=Date:To:From:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=lBvTifX8n3aZVCNKnuYPUx9JQnFkNfl0aCmJ+aTJ5EGUXxhYYcs1tyFrqDkltP2XY PwDLapI/T3n6KbiMvsghzkeq2Vvm5klecAYGczNgZDgGZfQUKoobitRzDg6rUnSQUh 9kwqeW8dB3ZOC/hn6lKI9exmQFkWNLNu81wlHmxc8tBNp8WVdPvbW/Fu5oc+fbzplr dDaXRz+IHu98BAHyQd4TYXuGijAX+KjobqwwEp9a8VObFTlHbkFdFaezLnsBdiy+fE al5q1+lVKNXeqSWaqqE8UjES+Hr4n0P1gN/TWFz14kbBO0yjla3tnem07GcwqUhLIK dVc4NWrRpeVvw== Message-ID: Feedback-ID: 24022468:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.43.25; envelope-from=luis.felipe.la@protonmail.com; helo=mail-4325.protonmail.ch X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) AC_FROM_MANY_DOTS=1.168, BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Luis Felipe X-ACL-Warn: , Luis Felipe via Guix-patches X-Patchwork-Original-From: Luis Felipe via Guix-patches via From: Luis Felipe Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hi, This is a patch for the guix-artwork repository. --- Luis Felipe López Acevedo https://luis-felipe.gitlab.io/ From ad0effaab60acdb7bd0e533bd544b49a4bee8a2b Mon Sep 17 00:00:00 2001 From: Luis Felipe 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